Backups/hl2sdk
1
0 Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2026-10-12 04:58:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.

Browse Source
This commit is contained in:
Scott Ehlert committed 2011-04-28 01:29:54 -05:00
1 parent d529bf38f5
commit 85773fe42c
300 files changed
+1041 -1084
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

game/server/player.cpp
+6 -6
View File
@@ -1564,7 +1564,7 @@ int CBasePlayer::OnTakeDamage_Alive( const CTakeDamageInfo &info )
if ( event )
{
event->SetInt("userid", GetUserID() );
event->SetInt("health", max(0, m_iHealth) );
event->SetInt("health", MAX(0, m_iHealth) );
event->SetInt("priority", 5 ); // HLTV event priority, not transmitted
if ( attacker->IsPlayer() )
@@ -3207,7 +3207,7 @@ void CBasePlayer::PhysicsSimulate( void )
int commandsToRun = vecAvailCommands.Count();
if ( gpGlobals->simTicksThisFrame >= commandLimit && vecAvailCommands.Count() > commandLimit )
{
int commandsToRollOver = min( vecAvailCommands.Count(), ( gpGlobals->simTicksThisFrame - 1 ) );
int commandsToRollOver = MIN( vecAvailCommands.Count(), ( gpGlobals->simTicksThisFrame - 1 ) );
commandsToRun = vecAvailCommands.Count() - commandsToRollOver;
Assert( commandsToRun >= 0 );
// Clear all contexts except the last one
@@ -3857,7 +3857,7 @@ void CBasePlayer::CheckTimeBasedDamage()
// after the player has been drowning and finally takes a breath
if (m_idrowndmg > m_idrownrestored)
{
int idif = min(m_idrowndmg - m_idrownrestored, 10);
int idif = MIN(m_idrowndmg - m_idrownrestored, 10);
TakeHealth(idif, DMG_GENERIC);
m_idrownrestored += idif;
@@ -3871,7 +3871,7 @@ void CBasePlayer::CheckTimeBasedDamage()
// after the player has been poisoned.
if (m_nPoisonDmg > m_nPoisonRestored)
{
int nDif = min(m_nPoisonDmg - m_nPoisonRestored, 10);
int nDif = MIN(m_nPoisonDmg - m_nPoisonRestored, 10);
TakeHealth(nDif, DMG_GENERIC);
m_nPoisonRestored += nDif;
}
@@ -6361,7 +6361,7 @@ bool CBasePlayer::ClientCommand( const CCommand &args )
int nRecords = -1; // all
if ( args.ArgC() >= 3 )
{
nRecords = max( Q_atoi( args.Arg( 2 ) ), 1 );
nRecords = MAX( Q_atoi( args.Arg( 2 ) ), 1 );
}
CBasePlayer *pl = UTIL_PlayerByIndex( nRecip );
@@ -8172,7 +8172,7 @@ int CBasePlayer::GetFOVForNetworking( void )
if ( gpGlobals->curtime - m_flFOVTime < m_Local.m_flFOVRate )
{
fFOV = min( fFOV, m_iFOVStart );
fFOV = MIN( fFOV, m_iFOVStart );
}
return fFOV;
}