Backups/hl2sdk
1
0 Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2026-10-11 07:58:00 +08:00
Code Issues Packages Projects Releases Wiki 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 committed 2011-04-28 01:30:09 -05:00
1 parent b9b7f08197
commit 3e7f7bdabd
300 files changed
+1041 -1084
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

game/server/BaseAnimatingOverlay.cpp
+2 -2
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 );
}
}
}