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:37 -05:00
1 parent 6c38e2e589
commit 4caefcbcba
300 files changed
+1041 -1084

No files matched your search

+1 -1
View File
@@ -426,7 +426,7 @@ void CViewRender::OnRenderStart()
int min_fov = player->GetMinFOV();
// Don't let it go too low
localFOV = max( min_fov, localFOV );
localFOV = MAX( min_fov, localFOV );
gHUD.m_flFOVSensitivityAdjust = 1.0f;
#ifndef _XBOX