refactor(client): misc minor renames and changes to appease compiler

inline getstat

move dir and angles inside

rename overshadowed i -> j

move int i inside for

rename te -> tempEntity

inline effects

rename observerTarget

inline bVisible

specify ParticleEffect and ControlPoint variables

rename idx

rename iBuffAttachment

rename outer i

remove unused var tPos

rename p -> p2

move int declare into for

rename info -> infoNew

fix i -> t

fix i -> j

rename i -> idx

rename pMaterialWf

rename msg -> kvMsg

move white and blue

remove duplicate fDelay

rename buf ->pathBuf

remove duplicate nNumHistogramBuckets

rename textTall -> smallTextTall

rename kv -> kvActive

add scope for player helper

rename matrix -> matrix2

rename i -> tail

renames in bWireframe

rename msg -> kvMsg

rename pButton -> phButton

rename pProfile -> pProfilePref

rename uvScale -> uvScale2

inline GetModelType

rename pEntry -> pEntry2

rename nNumShadows -> nNumBlobbyShadows

rename angle -> angle_yaw/angle_pitch

rename input -> x_input

rename w/h -> text_w/text_h

rename iRenderCache -> tail

remove unused GetBounds

add ifndef INFESTED_DLL for hudCloseCaption definition

remove duplicated definition of fBracketTime

rename entry -> repeatEntry

rename target -> targetI

rename entry -> repeatEntry

rename pParticle/offset -> pFlameParticle/randomOffset

remove unused variable offset

remove second local player check

remove second local base player check

suppress warning p4 hides global declaration

Author: anf3is

src/game/client/c_baseanimating.cpp

@@ -1204,43 +1204,43 @@ void C_BaseAnimating::ParseModelEffects( KeyValues *modelKeyValues )
 		for ( KeyValues *pSingleEffect = pkvAllParticleEffects->GetFirstSubKey(); pSingleEffect; pSingleEffect = pSingleEffect->GetNextKey() )
 		{
 			const char *pszParticleEffect = pSingleEffect->GetString( "name", "" );
-			const char *pszAttachment = pSingleEffect->GetString( "attachment_point", "" );
-			const char *pszAttachType = pSingleEffect->GetString( "attachment_type", "" );
-			const char *pszAttachOffset = pSingleEffect->GetString( "attachment_offset", "" );
+			const char *pszPEAttachment = pSingleEffect->GetString( "attachment_point", "" );
+			const char *pszPEAttachType = pSingleEffect->GetString( "attachment_type", "" );
+			const char *pszPEAttachOffset = pSingleEffect->GetString( "attachment_offset", "" );
 
 			// Convert attach type
-			int iAttachType = GetAttachTypeFromString( pszAttachType );
-			if ( iAttachType == -1 )
+			int iPEAttachType = GetAttachTypeFromString( pszPEAttachType );
+			if ( iPEAttachType == -1 )
 			{
-				Warning("Invalid attach type specified for particle effect in model '%s' keyvalues section. Trying to spawn effect '%s' with attach type of '%s'\n", GetModelName(), pszParticleEffect, pszAttachType );
+				Warning("Invalid attach type specified for particle effect in model '%s' keyvalues section. Trying to spawn effect '%s' with attach type of '%s'\n", GetModelName(), pszParticleEffect, pszPEAttachType );
 				return;
 			}
 
 			// Convert attachment point
-			int iAttachment = atoi(pszAttachment);
+			int iAttachment = atoi(pszPEAttachment);
 			// See if we can find any attachment points matching the name
-			if ( pszAttachment[0] != '0' && iAttachment == 0 )
+			if ( pszPEAttachment[0] != '0' && iAttachment == 0 )
 			{
-				iAttachment = LookupAttachment( pszAttachment );
+				iAttachment = LookupAttachment( pszPEAttachment );
 				if ( iAttachment == -1 )
 				{
-					Warning("Failed to find attachment point specified for particle effect in model '%s' keyvalues section. Trying to spawn effect '%s' on attachment named '%s'\n", GetModelName(), pszParticleEffect, pszAttachment );
+					Warning("Failed to find attachment point specified for particle effect in model '%s' keyvalues section. Trying to spawn effect '%s' on attachment named '%s'\n", GetModelName(), pszParticleEffect, pszPEAttachment );
 					return;
 				}
 			}
 
-			Vector vecOffset = vec3_origin;
+			Vector vecOffsetPE = vec3_origin;
 
-			if ( pszAttachOffset )
+			if ( pszPEAttachOffset )
 			{
 				float flVec[3];
-				UTIL_StringToVector( flVec, pszAttachOffset );
-				vecOffset = Vector( flVec[0], flVec[1], flVec[2] );
+				UTIL_StringToVector( flVec, pszPEAttachOffset );
+				vecOffsetPE = Vector( flVec[0], flVec[1], flVec[2] );
 			}
 
 			CUtlReference<CNewParticleEffect> hModelEffect;
 			// Spawn the particle effectw
-			hModelEffect = ParticleProp()->Create( pszParticleEffect, (ParticleAttachment_t)iAttachType, iAttachment, vecOffset );
+			hModelEffect = ParticleProp()->Create( pszParticleEffect, (ParticleAttachment_t)iPEAttachType, iAttachment, vecOffsetPE );
 
 			KeyValues *pkvAllControlPoints = pSingleEffect->FindKey("ControlPoints");
 			if ( pkvAllControlPoints )
@@ -1249,37 +1249,37 @@ void C_BaseAnimating::ParseModelEffects( KeyValues *modelKeyValues )
 				for ( KeyValues *pSingleCP = pkvAllControlPoints->GetFirstSubKey(); pSingleCP; pSingleCP = pSingleCP->GetNextKey() )
 				{
 					const char *pszControlPoint = pSingleCP->GetString( "cp_number", "" );
-					const char *pszAttachment = pSingleCP->GetString( "attachment_point", "" );
-					const char *pszAttachType = pSingleCP->GetString( "attachment_type", "" );
-					const char *pszAttachOffset = pSingleCP->GetString( "attachment_offset", "" );
+					const char *pszCPAttachment = pSingleCP->GetString( "attachment_point", "" );
+					const char *pszCPAttachType = pSingleCP->GetString( "attachment_type", "" );
+					const char *pszCPAttachOffset = pSingleCP->GetString( "attachment_offset", "" );
 
 					// Convert control point
 					int iControlPoint = atoi(pszControlPoint);
 
 					// Convert attach type
-					int iAttachType = GetAttachTypeFromString( pszAttachType );
-					if ( iAttachType == -1 )
+					int iCPAttachType = GetAttachTypeFromString( pszCPAttachType );
+					if ( iCPAttachType == -1 )
 					{
-						Warning("Invalid attach type specified for particle effect in model '%s' keyvalues section. Trying to spawn effect '%s' with attach type of '%s'\n", GetModelName(), pszParticleEffect, pszAttachType );
+						Warning("Invalid attach type specified for particle effect in model '%s' keyvalues section. Trying to spawn effect '%s' with attach type of '%s'\n", GetModelName(), pszParticleEffect, pszCPAttachType );
 						return;
 					}
 
-					Vector vecOffset = vec3_origin;
+					Vector vecOffsetCP = vec3_origin;
 
-					if ( pszAttachOffset )
+					if ( pszCPAttachOffset )
 					{
 						float flVec[3];
-						UTIL_StringToVector( flVec, pszAttachOffset );
-						vecOffset = Vector( flVec[0], flVec[1], flVec[2] );
+						UTIL_StringToVector( flVec, pszCPAttachOffset );
+						vecOffsetCP = Vector( flVec[0], flVec[1], flVec[2] );
 					}
 
 					// Add the control point if we already have the effect
 					if ( hModelEffect )
 					{
-						if ( iAttachType == PATTACH_WORLDORIGIN )
-							ParticleProp()->AddControlPoint( hModelEffect, iControlPoint, NULL, (ParticleAttachment_t)iAttachType, NULL, vecOffset );
+						if ( iCPAttachType == PATTACH_WORLDORIGIN )
+							ParticleProp()->AddControlPoint( hModelEffect, iControlPoint, NULL, (ParticleAttachment_t)iCPAttachType, NULL, vecOffsetCP );
 						else
-							ParticleProp()->AddControlPoint( hModelEffect, iControlPoint, this, (ParticleAttachment_t)iAttachType, pszAttachment, vecOffset );
+							ParticleProp()->AddControlPoint( hModelEffect, iControlPoint, this, (ParticleAttachment_t)iCPAttachType, pszCPAttachment, vecOffsetCP );
 					}
 
 				}
@@ -3403,9 +3403,9 @@ void C_BaseAnimating::DoInternalDrawModel( ClientModelRenderInfo_t *pInfo, DrawM
 				if ( VPhysicsGetObject() )
 				{
 					static color32 debugColorPhys = {255,0,0,0};
-					matrix3x4_t matrix;
-					VPhysicsGetObject()->GetPositionMatrix( &matrix );
-					engine->DebugDrawPhysCollide( pCollide->solids[0], NULL, matrix, debugColorPhys );
+					matrix3x4_t matrix2;
+					VPhysicsGetObject()->GetPositionMatrix( &matrix2 );
+					engine->DebugDrawPhysCollide( pCollide->solids[0], NULL, matrix2, debugColorPhys );
 				}
 			}
 		}

src/game/client/c_baseflex.cpp

@@ -478,8 +478,7 @@ class CFlexSceneFileManager : CAutoGameSystem
 		Q_FixSlashes( szFilename );
 
 		// See if it's already loaded
-		int i;
-		for ( i = 0; i < m_FileList.Count(); i++ )
+		for ( int i = 0; i < m_FileList.Count(); i++ )
 		{
 			CFlexSceneFile *file = m_FileList[ i ];
 			if ( file && !V_stricmp( file->filename, szFilename ) )

src/game/client/c_baseplayer.cpp

@@ -457,8 +457,7 @@ void C_BasePlayer::Spawn( void )
 	ClearFlags();
 	AddFlag( FL_CLIENT );
 
-	int effects = GetEffects() & EF_NOSHADOW;
-	SetEffects( effects );
+	SetEffects( GetEffects() & EF_NOSHADOW );
 
 	m_iFOV	= 0;	// init field of view.
 
@@ -1526,17 +1525,17 @@ void C_BasePlayer::CalcChaseCamView(Vector& eyeOrigin, QAngle& eyeAngles, float&
 
 void C_BasePlayer::CalcRoamingView(Vector& eyeOrigin, QAngle& eyeAngles, float& fov)
 {
-	C_BaseEntity *target = GetObserverTarget();
-	
-	if ( !target ) 
+	C_BaseEntity *observerTarget = GetObserverTarget();
+
+	if ( !observerTarget )
 	{
-		target = this;
+		observerTarget = this;
 	}
 
 	m_flObserverChaseDistance = 0.0;
 
-	eyeOrigin = target->EyePosition();
-	eyeAngles = target->EyeAngles();
+	eyeOrigin = observerTarget->EyePosition();
+	eyeAngles = observerTarget->EyeAngles();
 
 	if ( spec_track.GetInt() > 0 )
 	{

src/game/client/c_basetempentity.cpp

@@ -92,11 +92,11 @@ void C_BaseTempEntity::Precache( void )
 //-----------------------------------------------------------------------------
 void C_BaseTempEntity::PrecacheTempEnts( void )
 {
-	C_BaseTempEntity *te = GetList();
-	while ( te )
+	C_BaseTempEntity *tempEntity = GetList();
+	while ( tempEntity )
 	{
-		te->Precache();
-		te = te->GetNext();
+		tempEntity->Precache();
+		tempEntity = tempEntity->GetNext();
 	}
 }
 
@@ -106,12 +106,12 @@ void C_BaseTempEntity::PrecacheTempEnts( void )
 void C_BaseTempEntity::ClearDynamicTempEnts( void )
 {
 	C_BaseTempEntity *next;
-	C_BaseTempEntity *te = s_pDynamicEntities;
-	while ( te )
+	C_BaseTempEntity *tempEntity = s_pDynamicEntities;
+	while ( tempEntity )
 	{
-		next = te->GetNextDynamic();
-		delete te;
-		te = next;
+		next = tempEntity->GetNextDynamic();
+		delete tempEntity;
+		tempEntity = next;
 	}
 
 	s_pDynamicEntities = NULL;
@@ -123,20 +123,20 @@ void C_BaseTempEntity::ClearDynamicTempEnts( void )
 void C_BaseTempEntity::CheckDynamicTempEnts( void )
 {
 	C_BaseTempEntity *next, *newlist = NULL;
-	C_BaseTempEntity *te = s_pDynamicEntities;
-	while ( te )
+	C_BaseTempEntity *tempEntity = s_pDynamicEntities;
+	while ( tempEntity )
 	{
-		next = te->GetNextDynamic();
-		if ( te->ShouldDestroy() )
+		next = tempEntity->GetNextDynamic();
+		if ( tempEntity->ShouldDestroy() )
 		{
-			delete te;
+			delete tempEntity;
 		}
 		else
 		{
-			te->m_pNextDynamic = newlist;
-			newlist = te;
+			tempEntity->m_pNextDynamic = newlist;
+			newlist = tempEntity;
 		}
-		te = next;
+		tempEntity = next;
 	}
 
 	s_pDynamicEntities = newlist;

src/game/client/c_env_projectedtexture.cpp

@@ -312,9 +312,8 @@ void C_EnvProjectedTexture::UpdateLight( void )
 
 			NDebugOverlay::Box( vec3_origin, mins, maxs, 0, 255, 0, 100, 0.0f );
 #endif
-			
-			bool bVisible = IsBBoxVisible( mins, maxs );
-			if (!bVisible)
+
+			if ( !IsBBoxVisible( mins, maxs ) )
 			{
 				// Spotlight's extents aren't in view
 				if ( m_LightHandle != CLIENTSHADOW_INVALID_HANDLE )

src/game/client/c_particle_smokegrenade.cpp

@@ -909,12 +909,12 @@ void C_ParticleSmokeGrenade::CleanupToolRecordingState( KeyValues *msg )
 
 		int nId = AllocateToolParticleEffectId();
 
-		KeyValues *msg = new KeyValues( "OldParticleSystem_Create" );
-		msg->SetString( "name", "C_ParticleSmokeGrenade" );
-		msg->SetInt( "id", nId );
-		msg->SetFloat( "time", gpGlobals->curtime );
+		KeyValues *kvMsg = new KeyValues( "OldParticleSystem_Create" );
+		kvMsg->SetString( "name", "C_ParticleSmokeGrenade" );
+		kvMsg->SetInt( "id", nId );
+		kvMsg->SetFloat( "time", gpGlobals->curtime );
 
-		KeyValues *pEmitter = msg->FindKey( "DmeSpriteEmitter", true );
+		KeyValues *pEmitter = kvMsg->FindKey( "DmeSpriteEmitter", true );
 		pEmitter->SetInt( "count", NUM_PARTICLES_PER_DIMENSION * NUM_PARTICLES_PER_DIMENSION * NUM_PARTICLES_PER_DIMENSION );
 		pEmitter->SetFloat( "duration", 0 );
 		pEmitter->SetString( "material", "particle/particle_smokegrenade1" );
@@ -991,8 +991,8 @@ void C_ParticleSmokeGrenade::CleanupToolRecordingState( KeyValues *msg )
 		pSmokeGrenadeUpdater->SetFloat( "radiusExpandTime", SMOKESPHERE_EXPAND_TIME );
 		pSmokeGrenadeUpdater->SetFloat( "cutoffFraction", 0.7f );
 
-		ToolFramework_PostToolMessage( HTOOLHANDLE_INVALID, msg );
-		msg->deleteThis();
+		ToolFramework_PostToolMessage( HTOOLHANDLE_INVALID, kvMsg );
+		kvMsg->deleteThis();
 	}
 }
 

src/game/client/c_rope.cpp

@@ -234,9 +234,9 @@ void CRopeManager::AddToRenderCache( C_RopeKeyframe *pRope )
 	// If we didn't find one, then allocate the mofo.
 	if ( iRenderCache == nRenderCacheCount )
 	{
-		int iRenderCache = m_aRenderCache.AddToTail();
-		m_aRenderCache[iRenderCache].m_pSolidMaterial = pRope->GetSolidMaterial();
-		m_aRenderCache[iRenderCache].m_nCacheCount = 0;
+		int tail = m_aRenderCache.AddToTail();
+		m_aRenderCache[tail].m_pSolidMaterial = pRope->GetSolidMaterial();
+		m_aRenderCache[tail].m_nCacheCount = 0;
 	}
 
 	if ( m_aRenderCache[iRenderCache].m_nCacheCount >= MAX_ROPE_RENDERCACHE )
@@ -1506,6 +1506,7 @@ struct catmull_t
 };
 
 // bake out the terms of the catmull rom spline
+#pragma warning(suppress : 4459) // declaration of 'p4' hides global declaration
 void Catmull_Rom_Spline_Matrix( const Vector &p1, const Vector &p2, const Vector &p3, const Vector &p4, catmull_t &output )
 {
 	output.t3 = 0.5f * ((-1*p1) + (3*p2) + (-3*p3) + p4);	// 0.5 t^3 * [ (-1*p1) + ( 3*p2) + (-3*p3) + p4 ]
@@ -1618,10 +1619,10 @@ bool C_RopeKeyframe::CalculateEndPointAttachment( C_BaseEntity *pEnt, int iAttac
 			if ( !pModel )
 				return false;
 
-			int iAttachment = pModel->LookupAttachment( "buff_attach" );
+			int iBuffAttachment = pModel->LookupAttachment( "buff_attach" );
 			if ( pAngles )
-				return pModel->GetAttachment( iAttachment, vPos, *pAngles );
-			return pModel->GetAttachment( iAttachment, vPos );
+				return pModel->GetAttachment( iBuffAttachment, vPos, *pAngles );
+			return pModel->GetAttachment( iBuffAttachment, vPos );
 		}
 	}
 

src/game/client/c_sceneentity.cpp

@@ -1145,11 +1145,11 @@ void C_SceneEntity::PrefetchAnimBlocks( CChoreoScene *pScene )
 							{
 								// Now look up the animblock
 								mstudioseqdesc_t &seqdesc = pStudioHdr->pSeqdesc( iSequence );
-								for ( int i = 0 ; i < seqdesc.groupsize[ 0 ] ; ++i )
+								for ( int j = 0 ; j < seqdesc.groupsize[ 0 ] ; ++j )
 								{
-									for ( int j = 0; j < seqdesc.groupsize[ 1 ]; ++j )
+									for ( int k = 0; k < seqdesc.groupsize[ 1 ]; ++k )
 									{
-										int iAnimation = seqdesc.anim( i, j );
+										int iAnimation = seqdesc.anim( j, k );
 										int iBaseAnimation = pStudioHdr->iRelativeAnim( iSequence, iAnimation );
 										mstudioanimdesc_t &animdesc = pStudioHdr->pAnimdesc( iBaseAnimation );
 
@@ -1168,14 +1168,14 @@ void C_SceneEntity::PrefetchAnimBlocks( CChoreoScene *pScene )
 											++nResident;
 											if ( nSpew > 1 )
 											{
-												Msg( "%s:%s[%i:%i] was resident\n", pStudioHdr->pszName(), animdesc.pszName(), i, j );
+												Msg( "%s:%s[%i:%i] was resident\n", pStudioHdr->pszName(), animdesc.pszName(), j, k );
 											}
 										}
 										else
 										{
 											if ( nSpew != 0 )
 											{
-												Msg( "%s:%s[%i:%i] async load\n", pStudioHdr->pszName(), animdesc.pszName(), i, j );
+												Msg( "%s:%s[%i:%i] async load\n", pStudioHdr->pszName(), animdesc.pszName(), j, k );
 											}
 										}
 									}
@@ -1193,4 +1193,4 @@ void C_SceneEntity::PrefetchAnimBlocks( CChoreoScene *pScene )
 		return;
 
 	Msg( "%d of %d animations resident\n", nResident, nChecked );
-}
+}