Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 20:16:10 +08:00
Code Activity

Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.

Browse Source
This commit is contained in:
Scott Ehlert
2011-04-28 01:29:36 -05:00
parent 94dd57587b
commit 79f4a53df6
300 changed files with 1041 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game/server/BaseAnimatingOverlay.cpp
View File

@ -685,7 +685,7 @@ int CBaseAnimatingOverlay::AllocateLayer( int iPriority )
{
if (m_AnimOverlay[i].m_nPriority <= iPriority)
{
iNewOrder = max( iNewOrder, m_AnimOverlay[i].m_nOrder + 1 );
iNewOrder = MAX( iNewOrder, m_AnimOverlay[i].m_nOrder + 1 );
}
}
else if (m_AnimOverlay[ i ].IsDying())
@ -779,7 +779,7 @@ void CBaseAnimatingOverlay::SetLayerPriority( int iLayer, int iPriority )
{
if (m_AnimOverlay[i].m_nPriority <= iPriority)
{
iNewOrder = max( iNewOrder, m_AnimOverlay[i].m_nOrder + 1 );
iNewOrder = MAX( iNewOrder, m_AnimOverlay[i].m_nOrder + 1 );
}
}
}