mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2026-10-11 09:08:00 +08:00
Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.
This commit is contained in:
1 parent
d529bf38f5
commit
85773fe42c
300 files changed
+1041
-1084
No files matched your search
@@ -227,9 +227,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;
|
||||
|
||||
Reference in new issue
Block a user