1
0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 12:36:05 +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:28:41 -05:00
parent afe9f41508
commit 14deb350cf
265 changed files with 904 additions and 947 deletions

View File

@ -207,9 +207,9 @@ float CPointAngularVelocitySensor::SampleAngularVelocity(CBaseEntity *pEntity)
else
{
QAngle vecAngVel = pEntity->GetLocalAngularVelocity();
float flMax = max(fabs(vecAngVel[PITCH]), fabs(vecAngVel[YAW]));
float flMax = MAX(fabs(vecAngVel[PITCH]), fabs(vecAngVel[YAW]));
return max(flMax, fabs(vecAngVel[ROLL]));
return MAX(flMax, fabs(vecAngVel[ROLL]));
}
return 0;