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

@ -227,7 +227,7 @@ void CNavNode::CheckCrouch( void )
float floorZ;
if ( TheNavMesh->GetGroundHeight( m_pos, &floorZ ) )
{
maxFloorZ = max( maxFloorZ, floorZ + 0.1f );
maxFloorZ = MAX( maxFloorZ, floorZ + 0.1f );
}
}
}