1
0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 04:26:03 +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:30:09 -05:00
parent b9b7f08197
commit 3e7f7bdabd
300 changed files with 1041 additions and 1084 deletions

View File

@ -2434,7 +2434,7 @@ void CServerGameClients::ClientSettingsChanged( edict_t *pEdict )
flLerpRatio = 1.0f;
}
// #define FIXME_INTERP_RATIO
player->m_fLerpTime = max( flLerpAmount, flLerpRatio / player->m_nUpdateRate );
player->m_fLerpTime = MAX( flLerpAmount, flLerpRatio / player->m_nUpdateRate );
}
else
{