mirror of
https://github.com/alliedmodders/hl2sdk.git
synced 2026-10-12 03:48: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
@@ -125,7 +125,7 @@ Vector Pickup_DefaultPhysGunLaunchVelocity( const Vector &vecForward, float flMa
|
||||
float mass = flMass;
|
||||
if ( mass > 100 )
|
||||
{
|
||||
mass = min( mass, 1000 );
|
||||
mass = MIN( mass, 1000 );
|
||||
float flForceMin = physcannon_minforce.GetFloat();
|
||||
flForce = SimpleSplineRemapValClamped( mass, 100, 600, flForceMax, flForceMin );
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user