1
0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 12:06:07 +08:00

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

This commit is contained in:
Scott Ehlert
2011-04-28 01:29:22 -05:00
parent 88dd2ac536
commit 7f4855ae1f
265 changed files with 904 additions and 945 deletions

View File

@ -104,7 +104,7 @@ void CPlayerResource::UpdatePlayerData( void )
m_bConnected.Set( i, 1 );
m_iTeam.Set( i, pPlayer->GetTeamNumber() );
m_bAlive.Set( i, pPlayer->IsAlive()?1:0 );
m_iHealth.Set(i, max( 0, pPlayer->GetHealth() ) );
m_iHealth.Set(i, MAX( 0, pPlayer->GetHealth() ) );
// Don't update ping / packetloss everytime