Backups/hl2sdk
1
0 Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2026-10-12 01:08: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/nav_edit.cpp
+10 -10
View File
@@ -245,11 +245,11 @@ bool CNavMesh::GetActiveNavArea( void )
right *= ladder->m_width * 0.5f;
left = -right;
absMin.x += min( left.x, right.x );
absMin.y += min( left.y, right.y );
absMin.x += MIN( left.x, right.x );
absMin.y += MIN( left.y, right.y );
absMax.x += max( left.x, right.x );
absMax.y += max( left.y, right.y );
absMax.x += MAX( left.x, right.x );
absMax.y += MAX( left.y, right.y );
Extent e;
e.lo = absMin + Vector( -5, -5, -5 );
@@ -1354,13 +1354,13 @@ void CNavMesh::CommandNavEndArea( void )
// the two points defining the ladder are m_ladderAnchor and m_editCursorPos. The normal is m_ladderNormal.
Vector mins, maxs;
mins.x = min( m_ladderAnchor.x, m_editCursorPos.x );
mins.y = min( m_ladderAnchor.y, m_editCursorPos.y );
mins.z = min( m_ladderAnchor.z, m_editCursorPos.z );
mins.x = MIN( m_ladderAnchor.x, m_editCursorPos.x );
mins.y = MIN( m_ladderAnchor.y, m_editCursorPos.y );
mins.z = MIN( m_ladderAnchor.z, m_editCursorPos.z );
maxs.x = max( m_ladderAnchor.x, m_editCursorPos.x );
maxs.y = max( m_ladderAnchor.y, m_editCursorPos.y );
maxs.z = max( m_ladderAnchor.z, m_editCursorPos.z );
maxs.x = MAX( m_ladderAnchor.x, m_editCursorPos.x );
maxs.y = MAX( m_ladderAnchor.y, m_editCursorPos.y );
maxs.z = MAX( m_ladderAnchor.z, m_editCursorPos.z );
Vector2D ladderDir = m_ladderNormal.AsVector2D();
CreateLadder( mins, maxs, &ladderDir );