mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2026-10-11 14:18: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
b9b7f08197
commit
3e7f7bdabd
300 files changed
+1041
-1084
No files matched your search
@@ -1592,7 +1592,7 @@ void CBaseAnimating::CalculateIKLocks( float currentTime )
|
||||
VectorMA( estGround, pTarget->est.height, up, p1 );
|
||||
VectorMA( estGround, -pTarget->est.height, up, p2 );
|
||||
|
||||
float r = max(pTarget->est.radius,1);
|
||||
float r = MAX(pTarget->est.radius,1);
|
||||
|
||||
// don't IK to other characters
|
||||
ray.Init( p1, p2, Vector(-r,-r,0), Vector(r,r,1) );
|
||||
|
||||
Reference in new issue
Block a user