Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 20:46:03 +08:00
Code 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
2011-04-28 01:30:09 -05:00
parent b9b7f08197
commit 3e7f7bdabd
300 changed files with 1041 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game/shared/basecombatcharacter_shared.cpp
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 )