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

+2 -2
View File
@@ -2246,7 +2246,7 @@ static void CheckPushedEntity( CBaseEntity *pEntity, pushblock_t &params )
float t = expectedDist != 0.0f ? fabsf(deltaAngle / expectedDist) : 1.0f;
t = clamp(t,0,1);
fraction = max(fraction, t);
fraction = MAX(fraction, t);
}
else
{
@@ -6926,7 +6926,7 @@ void CBaseEntity::SUB_PerformFadeOut( void )
dt = 0.1f;
}
m_nRenderMode = kRenderTransTexture;
int speed = (int)max(1,256*dt); // fade out over 1 second
int speed = (int)MAX(1,256*dt); // fade out over 1 second
SetRenderColorA( (byte)UTIL_Approach( 0, m_clrRender->a, speed ) );
}