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:30:09 -05:00
1 parent b9b7f08197
commit 3e7f7bdabd
300 files changed
+1041 -1084

No files matched your search

+1 -1
View File
@@ -540,7 +540,7 @@ void CGib::BounceGibTouch ( CBaseEntity *pOther )
float volume;
float zvel = fabs(GetAbsVelocity().z);
volume = 0.8f * min(1.0, ((float)zvel) / 450.0f);
volume = 0.8f * MIN(1.0, ((float)zvel) / 450.0f);
CBreakable::MaterialSoundRandom( entindex(), (Materials)m_material, volume );
}