Backups/hl2sdk
1
0 Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2026-10-12 02: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:29:54 -05:00
1 parent d529bf38f5
commit 85773fe42c
300 files changed
+1041 -1084
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

game/server/func_breakablesurf.cpp
+5 -5
View File
@@ -275,11 +275,11 @@ void CBreakableSurface::SurfaceTouch( CBaseEntity *pOther )
float flMaxsWidth,flMaxsHeight;
PanePos(vTouchPos, &flMaxsWidth, &flMaxsHeight);
int nMinWidth = Floor2Int(max(0, min(flMinsWidth,flMaxsWidth)));
int nMaxWidth = Ceil2Int(min(m_nNumWide,max(flMinsWidth,flMaxsWidth)));
int nMinWidth = Floor2Int(MAX(0, MIN(flMinsWidth,flMaxsWidth)));
int nMaxWidth = Ceil2Int(fpmin(m_nNumWide,MAX(flMinsWidth,flMaxsWidth)));
int nMinHeight = Floor2Int(max(0, min(flMinsHeight,flMaxsHeight)));
int nMaxHeight = Ceil2Int(min(m_nNumHigh,max(flMinsHeight,flMaxsHeight)));
int nMinHeight = Floor2Int(MAX(0, MIN(flMinsHeight,flMaxsHeight)));
int nMaxHeight = Ceil2Int(fpmin(m_nNumHigh,MAX(flMinsHeight,flMaxsHeight)));
Vector vHitVel;
pOther->GetVelocity( &vHitVel, NULL );
@@ -783,7 +783,7 @@ void CBreakableSurface::SetSupport( int w, int h, float support )
//------------------------------------------------------------------------------
float CBreakableSurface::GetSupport(int nWidth, int nHeight)
{
return max(0,m_flSupport[nWidth][nHeight]);
return MAX(0,m_flSupport[nWidth][nHeight]);
}
//------------------------------------------------------------------------------