diff --git a/game/server/episodic/npc_advisor.cpp b/game/server/episodic/npc_advisor.cpp index 07e3e83d..cbe89919 100644 --- a/game/server/episodic/npc_advisor.cpp +++ b/game/server/episodic/npc_advisor.cpp @@ -821,7 +821,7 @@ void CNPC_Advisor::RunTask( const Task_t *pTask ) // swap them if necessary (1 must be the bottom) if (m_levitateCallback.m_vecGoalPos1.z > m_levitateCallback.m_vecGoalPos2.z) { - ::V_swap(m_levitateCallback.m_vecGoalPos1,m_levitateCallback.m_vecGoalPos2); + V_swap(m_levitateCallback.m_vecGoalPos1,m_levitateCallback.m_vecGoalPos2); } m_levitateCallback.m_flFloat = 0.06f; // this is an absolute accumulation upon gravity diff --git a/game/server/episodic/vehicle_jeep_episodic.cpp b/game/server/episodic/vehicle_jeep_episodic.cpp index 39b19445..48ad8c47 100644 --- a/game/server/episodic/vehicle_jeep_episodic.cpp +++ b/game/server/episodic/vehicle_jeep_episodic.cpp @@ -1626,13 +1626,13 @@ void CPropJeepEpisodic::InputOutsideTransition( inputdata_t &inputdata ) VectorRotate( vecSurroundMaxs, vecTeleportAngles, vecMaxs ); if ( vecMaxs.x < vecMins.x ) - ::V_swap( vecMins.x, vecMaxs.x ); + V_swap( vecMins.x, vecMaxs.x ); if ( vecMaxs.y < vecMins.y ) - ::V_swap( vecMins.y, vecMaxs.y ); + V_swap( vecMins.y, vecMaxs.y ); if ( vecMaxs.z < vecMins.z ) - ::V_swap( vecMins.z, vecMaxs.z ); + V_swap( vecMins.z, vecMaxs.z ); // Move up vecTeleportPos.z += ( vecMaxs.z - vecMins.z ); diff --git a/game/server/hl2/npc_attackchopper.cpp b/game/server/hl2/npc_attackchopper.cpp index c9d669e6..134d725f 100644 --- a/game/server/hl2/npc_attackchopper.cpp +++ b/game/server/hl2/npc_attackchopper.cpp @@ -1843,7 +1843,7 @@ void CNPC_AttackHelicopter::ShootAtPlayer( const Vector &vBasePos, const Vector for ( i = 0; i < nActualTargets; ++i ) { int nSwap = random->RandomInt( 0, nActualTargets - 1 ); - ::V_swap( ppNearbyTargets[i], ppNearbyTargets[nSwap] ); + V_swap( ppNearbyTargets[i], ppNearbyTargets[nSwap] ); } // Just shoot where we're facing @@ -2120,7 +2120,7 @@ void CNPC_AttackHelicopter::ShootAtVehicle( const Vector &vBasePos, const Vector for ( i = 0; i < nActualTargets; ++i ) { int nSwap = random->RandomInt( 0, nActualTargets - 1 ); - ::V_swap( ppNearbyTargets[i], ppNearbyTargets[nSwap] ); + V_swap( ppNearbyTargets[i], ppNearbyTargets[nSwap] ); } // Just shoot where we're facing diff --git a/game/server/hl2/npc_combinecamera.cpp b/game/server/hl2/npc_combinecamera.cpp index 18639fe6..0c962533 100644 --- a/game/server/hl2/npc_combinecamera.cpp +++ b/game/server/hl2/npc_combinecamera.cpp @@ -355,7 +355,7 @@ void CNPC_CombineCamera::Spawn() if (m_nOuterRadius < m_nInnerRadius) { - ::V_swap(m_nOuterRadius, m_nInnerRadius); + V_swap(m_nOuterRadius, m_nInnerRadius); } // Do we start active? @@ -1117,17 +1117,17 @@ void CNPC_CombineCamera::SetHeight(float height) if (mins.x > maxs.x) { - ::V_swap(mins.x, maxs.x); + V_swap(mins.x, maxs.x); } if (mins.y > maxs.y) { - ::V_swap(mins.y, maxs.y); + V_swap(mins.y, maxs.y); } if (mins.z > maxs.z) { - ::V_swap(mins.z, maxs.z); + V_swap(mins.z, maxs.z); } SetCollisionBounds(mins, maxs); diff --git a/game/server/hl2/npc_turret_ceiling.cpp b/game/server/hl2/npc_turret_ceiling.cpp index d62b3a8d..ee14a17a 100644 --- a/game/server/hl2/npc_turret_ceiling.cpp +++ b/game/server/hl2/npc_turret_ceiling.cpp @@ -1093,17 +1093,17 @@ void CNPC_CeilingTurret::SetHeight( float height ) if ( mins.x > maxs.x ) { - ::V_swap( mins.x, maxs.x ); + V_swap( mins.x, maxs.x ); } if ( mins.y > maxs.y ) { - ::V_swap( mins.y, maxs.y ); + V_swap( mins.y, maxs.y ); } if ( mins.z > maxs.z ) { - ::V_swap( mins.z, maxs.z ); + V_swap( mins.z, maxs.z ); } SetCollisionBounds( mins, maxs ); diff --git a/game/shared/hl2mp/hl2mp_gamerules.cpp b/game/shared/hl2mp/hl2mp_gamerules.cpp index 64e4fbd8..5a18e5fc 100644 --- a/game/shared/hl2mp/hl2mp_gamerules.cpp +++ b/game/shared/hl2mp/hl2mp_gamerules.cpp @@ -866,7 +866,7 @@ bool CHL2MPRules::ShouldCollide( int collisionGroup0, int collisionGroup1 ) if ( collisionGroup0 > collisionGroup1 ) { // swap so that lowest is always first - ::V_swap(collisionGroup0,collisionGroup1); + V_swap(collisionGroup0,collisionGroup1); } if ( (collisionGroup0 == COLLISION_GROUP_PLAYER || collisionGroup0 == COLLISION_GROUP_PLAYER_MOVEMENT) && diff --git a/game/shared/sdk/sdk_gamerules.cpp b/game/shared/sdk/sdk_gamerules.cpp index d4aa4f01..2802c332 100644 --- a/game/shared/sdk/sdk_gamerules.cpp +++ b/game/shared/sdk/sdk_gamerules.cpp @@ -295,7 +295,7 @@ bool CSDKGameRules::ShouldCollide( int collisionGroup0, int collisionGroup1 ) if ( collisionGroup0 > collisionGroup1 ) { // swap so that lowest is always first - ::V_swap(collisionGroup0,collisionGroup1); + V_swap(collisionGroup0,collisionGroup1); } //Don't stand on COLLISION_GROUP_WEAPON diff --git a/mathlib/mathlib_base.cpp b/mathlib/mathlib_base.cpp index 2a5983c1..63ba0b60 100644 --- a/mathlib/mathlib_base.cpp +++ b/mathlib/mathlib_base.cpp @@ -380,9 +380,9 @@ void MatrixInvert( const matrix3x4_t& in, matrix3x4_t& out ) Assert( s_bMathlibInitialized ); if ( &in == &out ) { - ::V_swap(out[0][1],out[1][0]); - ::V_swap(out[0][2],out[2][0]); - ::V_swap(out[1][2],out[2][1]); + V_swap(out[0][1],out[1][0]); + V_swap(out[0][2],out[2][0]); + V_swap(out[1][2],out[2][1]); } else { @@ -1264,18 +1264,18 @@ bool SolveInverseQuadraticMonotonic( float x1, float y1, float x2, float y2, flo // first, sort parameters if (x1>x2) { - ::V_swap(x1,x2); - ::V_swap(y1,y2); + V_swap(x1,x2); + V_swap(y1,y2); } if (x2>x3) { - ::V_swap(x2,x3); - ::V_swap(y2,y3); + V_swap(x2,x3); + V_swap(y2,y3); } if (x1>x2) { - ::V_swap(x1,x2); - ::V_swap(y1,y2); + V_swap(x1,x2); + V_swap(y1,y2); } // this code is not fast. what it does is when the curve would be non-monotonic, slowly shifts // the center point closer to the linear line between the endpoints. Should anyone need htis diff --git a/public/particles/particles.h b/public/particles/particles.h index c3ab0526..6078a636 100644 --- a/public/particles/particles.h +++ b/public/particles/particles.h @@ -1452,7 +1452,7 @@ inline void CParticleCollection::SwapPosAndPrevPos( void ) { // strides better be the same! Assert( m_nParticleFloatStrides[PARTICLE_ATTRIBUTE_XYZ] == m_nParticleFloatStrides[ PARTICLE_ATTRIBUTE_PREV_XYZ ] ); - ::V_swap( m_pParticleAttributes[ PARTICLE_ATTRIBUTE_XYZ ], m_pParticleAttributes[ PARTICLE_ATTRIBUTE_PREV_XYZ ] ); + V_swap( m_pParticleAttributes[ PARTICLE_ATTRIBUTE_XYZ ], m_pParticleAttributes[ PARTICLE_ATTRIBUTE_PREV_XYZ ] ); } inline void CParticleCollection::LoanKillListTo( CParticleCollection *pBorrower ) const diff --git a/public/tier1/utlblockmemory.h b/public/tier1/utlblockmemory.h index 503487fa..19b34c72 100644 --- a/public/tier1/utlblockmemory.h +++ b/public/tier1/utlblockmemory.h @@ -137,10 +137,10 @@ CUtlBlockMemory::~CUtlBlockMemory() template< class T, class I > void CUtlBlockMemory::Swap( CUtlBlockMemory< T, I > &mem ) { - ::V_swap( m_pMemory, mem.m_pMemory ); - ::V_swap( m_nBlocks, mem.m_nBlocks ); - ::V_swap( m_nIndexMask, mem.m_nIndexMask ); - ::V_swap( m_nIndexShift, mem.m_nIndexShift ); + V_swap( m_pMemory, mem.m_pMemory ); + V_swap( m_nBlocks, mem.m_nBlocks ); + V_swap( m_nIndexMask, mem.m_nIndexMask ); + V_swap( m_nIndexShift, mem.m_nIndexShift ); } diff --git a/public/tier1/utlfixedmemory.h b/public/tier1/utlfixedmemory.h index d33996f6..bb84844d 100644 --- a/public/tier1/utlfixedmemory.h +++ b/public/tier1/utlfixedmemory.h @@ -181,9 +181,9 @@ CUtlFixedMemory::~CUtlFixedMemory() template< class T > void CUtlFixedMemory::Swap( CUtlFixedMemory< T > &mem ) { - ::V_swap( m_pBlocks, mem.m_pBlocks ); - ::V_swap( m_nAllocationCount, mem.m_nAllocationCount ); - ::V_swap( m_nGrowSize, mem.m_nGrowSize ); + V_swap( m_pBlocks, mem.m_pBlocks ); + V_swap( m_nAllocationCount, mem.m_nAllocationCount ); + V_swap( m_nGrowSize, mem.m_nGrowSize ); } diff --git a/public/tier1/utlmemory.h b/public/tier1/utlmemory.h index a6b67a81..e4f2bcea 100644 --- a/public/tier1/utlmemory.h +++ b/public/tier1/utlmemory.h @@ -327,9 +327,9 @@ void CUtlMemory::Init( int nGrowSize /*= 0*/, int nInitSize /*= 0*/ ) template< class T, class I > void CUtlMemory::Swap( CUtlMemory &mem ) { - ::V_swap( m_nGrowSize, mem.m_nGrowSize ); - ::V_swap( m_pMemory, mem.m_pMemory ); - ::V_swap( m_nAllocationCount, mem.m_nAllocationCount ); + V_swap( m_nGrowSize, mem.m_nGrowSize ); + V_swap( m_pMemory, mem.m_pMemory ); + V_swap( m_nAllocationCount, mem.m_nAllocationCount ); } diff --git a/public/tier1/utlrbtree.h b/public/tier1/utlrbtree.h index 0efd4375..b9b49eb8 100644 --- a/public/tier1/utlrbtree.h +++ b/public/tier1/utlrbtree.h @@ -1547,12 +1547,12 @@ template < class T, class I, typename L, class M > void CUtlRBTree::Swap( CUtlRBTree< T, I, L > &that ) { m_Elements.Swap( that.m_Elements ); - ::V_swap( m_LessFunc, that.m_LessFunc ); - ::V_swap( m_Root, that.m_Root ); - ::V_swap( m_NumElements, that.m_NumElements ); - ::V_swap( m_FirstFree, that.m_FirstFree ); - ::V_swap( m_pElements, that.m_pElements ); - ::V_swap( m_LastAlloc, that.m_LastAlloc ); + V_swap( m_LessFunc, that.m_LessFunc ); + V_swap( m_Root, that.m_Root ); + V_swap( m_NumElements, that.m_NumElements ); + V_swap( m_FirstFree, that.m_FirstFree ); + V_swap( m_pElements, that.m_pElements ); + V_swap( m_LastAlloc, that.m_LastAlloc ); Assert( IsValid() ); Assert( m_Elements.IsValidIterator( m_LastAlloc ) || ( m_NumElements == 0 && m_FirstFree == InvalidIndex() ) ); } diff --git a/public/tier1/utlvector.h b/public/tier1/utlvector.h index 6e536cee..3dd9186e 100644 --- a/public/tier1/utlvector.h +++ b/public/tier1/utlvector.h @@ -415,7 +415,7 @@ void CUtlVector::Sort( int (__cdecl *pfnCompare)(const T *, const T *) ) { if ( pfnCompare( &Element( j - 1 ), &Element( j ) ) < 0 ) { - ::V_swap( Element( j - 1 ), Element( j ) ); + V_swap( Element( j - 1 ), Element( j ) ); } } } @@ -605,8 +605,8 @@ template< typename T, class A > void CUtlVector::Swap( CUtlVector< T, A > &vec ) { m_Memory.Swap( vec.m_Memory ); - ::V_swap( m_Size, vec.m_Size ); - ::V_swap( m_pElements, vec.m_pElements ); + V_swap( m_Size, vec.m_Size ); + V_swap( m_pElements, vec.m_pElements ); } template< typename T, class A > diff --git a/utils/common/mstristrip.cpp b/utils/common/mstristrip.cpp index 00ad060f..84601017 100644 --- a/utils/common/mstristrip.cpp +++ b/utils/common/mstristrip.cpp @@ -365,7 +365,7 @@ STRIPLIST::iterator FindBestCachedStrip(STRIPLIST *pstriplist, // make sure we keep the list in order and always pull off // the first dude. if(istriplistbest != pstriplist->begin()) - ::V_swap(*istriplistbest, *pstriplist->begin()); + V_swap(*istriplistbest, *pstriplist->begin()); return pstriplist->begin(); } diff --git a/utils/vbsp/disp_ivp.cpp b/utils/vbsp/disp_ivp.cpp index 81b15af6..31ae5839 100644 --- a/utils/vbsp/disp_ivp.cpp +++ b/utils/vbsp/disp_ivp.cpp @@ -207,7 +207,7 @@ CDispMeshEvent::CDispMeshEvent( unsigned short *pIndices, int indexCount, CCoreD } for ( int i = 0; i < indexCount/2; i++ ) { - ::V_swap( pIndices[i], pIndices[(indexCount-i)-1] ); + V_swap( pIndices[i], pIndices[(indexCount-i)-1] ); } int count = maxIndex + 1; m_verts.SetCount( count );