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

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

No files matched your search

+1 -1
View File
@@ -119,7 +119,7 @@ void CBaseCombatCharacter::RemoveAmmo( int iCount, int iAmmoIndex )
return;
// Ammo pickup sound
m_iAmmo.Set( iAmmoIndex, max( m_iAmmo[iAmmoIndex] - iCount, 0 ) );
m_iAmmo.Set( iAmmoIndex, MAX( m_iAmmo[iAmmoIndex] - iCount, 0 ) );
}
void CBaseCombatCharacter::RemoveAmmo( int iCount, const char *szName )