! fix m_index

Author: anf3is

src/game/client/c_baseanimating.cpp

@@ -2741,7 +2741,7 @@ bool C_BaseAnimating::SetupBones( matrix3x4a_t *pBoneToWorldOut, int nMaxBones,
 		// Prevent spammage!!!
 		if ( gpGlobals->realtime >= lastWarning + 1.0f )
 		{
-			DevMsgRT( "*** ERROR: Bone access not allowed (entity %i:%s)\n", index, GetClassname() );
+			DevMsgRT( "*** ERROR: Bone access not allowed (entity %i:%s)\n", m_index, GetClassname() );
 			lastWarning = gpGlobals->realtime;
 		}
 	}
@@ -3504,7 +3504,7 @@ int C_BaseAnimating::InternalDrawModel( int flags, const RenderableInstance_t &i
 	pInfo->flags = flags;
 	pInfo->pRenderable = this;
 	pInfo->instance = GetModelInstance();
-	pInfo->entity_index = index;
+	pInfo->entity_index = m_index;
 	pInfo->pModel = GetModel();
 	pInfo->origin = GetRenderOrigin();
 	pInfo->angles = GetRenderAngles();
@@ -3579,7 +3579,7 @@ void C_BaseAnimating::ProcessMuzzleFlashEvent()
 			GetAttachment( 1, vAttachment, dummyAngles );
 
 			// Make an elight
-			dlight_t *el = effects->CL_AllocElight( LIGHT_INDEX_MUZZLEFLASH + index );
+			dlight_t *el = effects->CL_AllocElight( LIGHT_INDEX_MUZZLEFLASH + m_index );
 			el->origin = vAttachment;
 			el->radius = random->RandomInt( 32, 64 ); 
 			el->decay = el->radius / 0.05f;

src/game/client/c_baseplayer.cpp

@@ -688,7 +688,7 @@ void C_BasePlayer::CheckForLocalPlayer( int nSplitScreenSlot )
 	if ( g_nKillCamMode )
 		iLocalPlayerIndex = g_nKillCamTarget1;
 
-	if ( iLocalPlayerIndex == index )
+	if ( iLocalPlayerIndex == m_index )
 	{
 		Assert( s_pLocalPlayer[ nSplitScreenSlot ] == NULL );
 		s_pLocalPlayer[ nSplitScreenSlot ] = this;
@@ -737,7 +737,7 @@ void C_BasePlayer::PostDataUpdate( DataUpdateType_t updateType )
 	FOR_EACH_VALID_SPLITSCREEN_PLAYER( i )
 	{
 		int nIndex = engine->GetSplitScreenPlayer( i );
-		if ( nIndex == index )
+		if ( nIndex == m_index )
 		{
 			nSlot = i;
 			break;
@@ -1181,7 +1181,7 @@ void C_BasePlayer::UpdateFlashlight()
 
 	if ( pFlashlightPlayer )
 	{
-		FlashlightEffectManager().SetEntityIndex( pFlashlightPlayer->index );
+		FlashlightEffectManager().SetEntityIndex( pFlashlightPlayer->m_index );
 	}
 
 	// The dim light is the flashlight.
@@ -1194,12 +1194,12 @@ void C_BasePlayer::UpdateFlashlight()
 			// Turned on the headlight; create it.
 			if ( pszTextureName )
 			{
-				FlashlightEffectManager().TurnOnFlashlight( pFlashlightPlayer->index, pszTextureName, pFlashlightPlayer->GetFlashlightFOV(),
+				FlashlightEffectManager().TurnOnFlashlight( pFlashlightPlayer->m_index, pszTextureName, pFlashlightPlayer->GetFlashlightFOV(),
 					pFlashlightPlayer->GetFlashlightFarZ(), pFlashlightPlayer->GetFlashlightLinearAtten() );
 			}
 			else
 			{
-				FlashlightEffectManager().TurnOnFlashlight( pFlashlightPlayer->index );
+				FlashlightEffectManager().TurnOnFlashlight( pFlashlightPlayer->m_index );
 			}
 			m_bFlashlightEnabled[ iSsPlayer ] = true;
 		}

src/game/client/c_beamspotlight.cpp

@@ -337,9 +337,9 @@ void C_BeamSpotLight::ComputeRenderInfo()
 				return;
 
 			// Deal with the environment light
-			if ( !m_pDynamicLight || (m_pDynamicLight->key != index) )
+			if ( !m_pDynamicLight || (m_pDynamicLight->key != m_index) )
 			{
-				m_pDynamicLight = effects->CL_AllocDlight( index );
+				m_pDynamicLight = effects->CL_AllocDlight( m_index );
 				assert (m_pDynamicLight);
 			}
 

src/game/client/c_dynamiclight.cpp

@@ -134,14 +134,14 @@ void C_DynamicLight::ClientThink(void)
 	if ( (m_Flags & DLIGHT_NO_MODEL_ILLUMINATION) == 0 )
 	{
 		// Deal with the model light
- 		if ( !m_pDynamicLight || (m_pDynamicLight->key != index) )
+ 		if ( !m_pDynamicLight || (m_pDynamicLight->key != m_index) )
 		{
 #if DLIGHT_NO_WORLD_USES_ELIGHT
 			m_pDynamicLight = ShouldBeElight() != 0
-				? effects->CL_AllocElight( index )
-				: effects->CL_AllocDlight( index );
+				? effects->CL_AllocElight( m_index )
+				: effects->CL_AllocDlight( m_index );
 #else
-			m_pDynamicLight = effects->CL_AllocDlight( index );
+			m_pDynamicLight = effects->CL_AllocDlight( m_index );
 #endif
 			Assert (m_pDynamicLight);
 			m_pDynamicLight->minlight = 0;
@@ -181,9 +181,9 @@ void C_DynamicLight::ClientThink(void)
 	{
 		// Raycast to where the endpoint goes
 		// Deal with the environment light
-		if ( !m_pSpotlightEnd || (m_pSpotlightEnd->key != -index) )
+		if ( !m_pSpotlightEnd || (m_pSpotlightEnd->key != -m_index) )
 		{
-			m_pSpotlightEnd = effects->CL_AllocDlight( -index );
+			m_pSpotlightEnd = effects->CL_AllocDlight( -m_index );
 			Assert (m_pSpotlightEnd);
 		}
 

src/game/client/c_entityflame.cpp

@@ -131,7 +131,7 @@ bool C_EntityFlame::Simulate( void )
 #ifdef HL2_EPISODIC 
 	if ( IsEffectActive(EF_BRIGHTLIGHT) || IsEffectActive(EF_DIMLIGHT) )
 	{
-		dlight_t *dl = effects->CL_AllocDlight( index );
+		dlight_t *dl = effects->CL_AllocDlight( m_index );
 		dl->origin = GetAbsOrigin();
  		dl->origin[2] += 16;
 		dl->color.r = 254;

src/game/client/c_plasma.cpp

@@ -342,7 +342,7 @@ void C_Plasma::Start( void )
 		m_entFlames[i].SetRenderColor( 255, 255, 255 );
 		m_entFlames[i].SetRenderAlpha( 255 );
 		m_entFlames[i].SetBrightness( 255 );
-		m_entFlames[i].index				= -1;
+		m_entFlames[i].m_index				= -1;
 
 		if ( i == 0 )
 		{
@@ -364,7 +364,7 @@ void C_Plasma::Start( void )
 	m_entGlow.SetRenderColor( 255, 255, 255 );
 	m_entGlow.SetRenderAlpha( 255 );
 	m_entGlow.SetBrightness( 255 );
-	m_entGlow.index				= -1;
+	m_entGlow.m_index				= -1;
 
 	m_flGlowScale				= m_flStartScale;
 

src/game/client/c_recipientfilter.cpp

@@ -95,7 +95,7 @@ void C_RecipientFilter::AddRecipient( C_BasePlayer *player )
 	if ( !player )
 		return;
 
-	int index = player->index;
+	int index = player->m_index;
 
 	// If we're predicting and this is not the first time we've predicted this sound
 	//  then don't send it to the local player again.
@@ -127,7 +127,7 @@ void C_RecipientFilter::RemoveRecipient( C_BasePlayer *player )
 	if ( !player )
 		return;
 
-	int index = player->index;
+	int index = player->m_index;
 
 	// Remove it if it's in the list
 	m_Recipients.FindAndRemove( index );
@@ -153,7 +153,7 @@ void C_RecipientFilter::AddPlayersFromBitMask( CPlayerBitVec& playerbits )
 			continue;
 
 		// only add the local player on client side
-		if ( !playerbits[ pPlayer->index ] )
+		if ( !playerbits[ pPlayer->m_index ] )
 			continue;
 
 		AddRecipient( pPlayer );

src/game/client/c_spotlight_end.cpp

@@ -111,9 +111,9 @@ void C_SpotlightEnd::ClientThink(void)
 		return;
 
 	// Deal with the environment light
-	if ( !m_pDynamicLight || (m_pDynamicLight->key != index) )
+	if ( !m_pDynamicLight || (m_pDynamicLight->key != m_index) )
 	{
-		m_pDynamicLight = effects->CL_AllocDlight( index );
+		m_pDynamicLight = effects->CL_AllocDlight( m_index );
 		assert (m_pDynamicLight);
 	}
 
@@ -128,9 +128,9 @@ void C_SpotlightEnd::ClientThink(void)
 	VectorCopy (m_vSpotlightDir,  m_pDynamicLight->m_Direction);
 
 	// Deal with the model light
- 	if ( !m_pModelLight || (m_pModelLight->key != -index) )
+ 	if ( !m_pModelLight || (m_pModelLight->key != -m_index) )
 	{
-		m_pModelLight = effects->CL_AllocDlight( -index );
+		m_pModelLight = effects->CL_AllocDlight( -m_index );
 		assert (m_pModelLight);
 	}
 

src/game/client/c_te_legacytempents.cpp

@@ -105,7 +105,7 @@ void C_LocalTempEntity::Prepare( model_t *pmodel, float time )
 {
 	Interp_SetupMappings( GetVarMapping() );
 
-	index = -1;
+	m_index = -1;
 	Clear();
 
 	// Use these to set per-frame and termination conditions / actions
@@ -168,7 +168,7 @@ int C_LocalTempEntity::DrawStudioModel( int flags )
 			flags, 
 			this,
 			MODEL_INSTANCE_INVALID,
-			index, 
+			m_index, 
 			GetModel(),
 			GetAbsOrigin(),
 			GetAbsAngles(),
@@ -948,7 +948,7 @@ int BreakModelDrawHelper( C_LocalTempEntity *entity, int flags )
 	sInfo.flags = flags;
 	sInfo.pRenderable = entity;
 	sInfo.instance = MODEL_INSTANCE_INVALID;
-	sInfo.entity_index = entity->index;
+	sInfo.entity_index = entity->m_index;
 	sInfo.pModel = entity->GetModel();
 	sInfo.origin = entity->GetRenderOrigin();
 	sInfo.angles = entity->GetRenderAngles();
@@ -2189,7 +2189,7 @@ int CTempEnts::AddVisibleTempEntity( C_LocalTempEntity *pEntity )
 	//if ( engine->IsBoxInViewCluster( mins, maxs ) )
 	{
 		// Temporary entities have no corresponding element in cl_entitylist
-		pEntity->index = -1;
+		pEntity->m_index = -1;
 
 		// Add to list
 		pEntity->AddToLeafSystem( false );

src/game/client/c_team.cpp

@@ -186,7 +186,7 @@ C_Team *GetLocalTeam( void )
 	if ( !player )
 		return NULL;
 
-	return GetPlayersTeam( player->index );
+	return GetPlayersTeam( player->m_index );
 }
 
 //-----------------------------------------------------------------------------
@@ -253,4 +253,4 @@ bool ArePlayersOnSameTeam( int iPlayerIndex1, int iPlayerIndex2 )
 int GetNumberOfTeams( void )
 {
 	return g_Teams.Count();
-}
+}