Changed DM spawn protection to use an uber condition

src/game/client/tf/c_tf_player.cpp

@@ -959,7 +959,9 @@ class CProxyInvulnLevel : public CResultProxy
 
 		if ( pPlayer )
 		{
-			if ( pPlayer->m_Shared.IsInvulnerable() && !pPlayer->m_Shared.InCond( TF_COND_INVULNERABLE_WEARINGOFF ) )
+			if ( pPlayer->m_Shared.IsInvulnerable() &&
+				!pPlayer->m_Shared.InCond( TF_COND_INVULNERABLE_WEARINGOFF ) &&
+				( !pPlayer->m_Shared.InCond( TF_COND_INVULNERABLE_SPAWN_PROTECT ) || pPlayer->m_Shared.GetConditionDuration( TF_COND_INVULNERABLE_SPAWN_PROTECT ) > 1.0f ) )
 			{
 				m_pResult->SetFloatValue( 1.0 );
 			}
@@ -1188,7 +1190,7 @@ class CProxyModelGlowColor : public CResultProxy
 				vecColor = critColor;
 			}
 			else if ( !pPlayer->m_Shared.InCond( TF_COND_DISGUISED ) ||
-				pPlayer->InSameTeam( C_TFPlayer::GetLocalTFPlayer() ) ||
+				!pPlayer->IsEnemyPlayer() ||
 				pPlayer->GetTeamNumber() == pPlayer->m_Shared.GetDisguiseTeam() )
 			{
 				switch ( pPlayer->GetTeamNumber() )
@@ -2091,7 +2093,7 @@ void C_TFPlayer::InitInvulnerableMaterial( void )
 
 	int iVisibleTeam = GetTeamNumber();
 	// if this player is disguised and on the other team, use disguise team
-	if ( m_Shared.InCond( TF_COND_DISGUISED ) && !InSameTeam( pLocalPlayer ) )
+	if ( m_Shared.InCond( TF_COND_DISGUISED ) && IsEnemyPlayer() )
 	{
 		iVisibleTeam = m_Shared.GetDisguiseTeam();
 	}

src/game/server/tf/tf_player.cpp

@@ -114,6 +114,7 @@ ConVar tf2c_random_weapons( "tf2c_random_weapons", "0", FCVAR_NOTIFY, "Makes pla
 ConVar tf2c_allow_special_classes( "tf2c_allow_special_classes", "0", FCVAR_NOTIFY, "Enables gamemode specific classes (Civilian, Mercenary, ...) in normal gameplay." );
 ConVar tf2c_force_stock_weapons( "tf2c_force_stock_weapons", "0", FCVAR_NOTIFY, "Forces players to use the stock loadout." );
 ConVar tf2c_legacy_weapons( "tf2c_legacy_weapons", "0", FCVAR_DEVELOPMENTONLY, "Disables all new weapons as well as Econ Item System." );
+ConVar tf2c_dm_spawnprotecttime( "tf2c_dm_spawnprotecttime", "5", FCVAR_REPLICATED | FCVAR_NOTIFY, "Time (in seconds) that the DM spawn protection lasts" );
 
 // -------------------------------------------------------------------------------- //
 // Player animation event. Sent to the client when a player fires, jumps, reloads, etc..
@@ -501,19 +502,6 @@ void CTFPlayer::TFPlayerThink()
 		m_bJumpEffect = true;
 	}
 
-	if ( TFGameRules()->IsDeathmatch() && IsAlive() && m_flSpawnProtectTime )
-	{
-		if ( ( gpGlobals->curtime > m_flSpawnProtectTime ) || ( m_nButtons & IN_ATTACK ) )
-		{
-			RemoveFlag( FL_GODMODE );
-			m_nRenderFX = kRenderFxNone;
-			RemoveEffects( EF_ITEM_BLINK );
-			GetViewModel()->m_nRenderFX = kRenderFxNone;
-			GetViewModel()->RemoveEffects( EF_ITEM_BLINK );
-			m_flSpawnProtectTime = 0;
-		}
-	}
-
 	SetContextThink( &CTFPlayer::TFPlayerThink, gpGlobals->curtime, "TFPlayerThink" );
 }
 
@@ -974,6 +962,11 @@ void CTFPlayer::Spawn()
 			m_Shared.AddCond( TF_COND_HEALTH_BUFF );
 		}
 
+		if ( TFGameRules()->IsDeathmatch() )
+		{
+			m_Shared.AddCond( TF_COND_INVULNERABLE_SPAWN_PROTECT, tf2c_dm_spawnprotecttime.GetFloat() );
+		}
+
 		if ( !m_bSeenRoundInfo )
 		{
 			TFGameRules()->ShowRoundInfoPanel( this );

src/game/server/tf/tf_player.h

@@ -455,8 +455,6 @@ class CTFPlayer : public CBaseMultiplayerPlayer, public IHasAttributes
 	CEconEntity			*GetEntityForLoadoutSlot( int iSlot );
 	CEconWearable		*GetWearableForLoadoutSlot( int iSlot );
 
-	float	m_flSpawnProtectTime;
-
 	bool CalculateAmmoPackPositionAndAngles( CTFWeaponBase *pWeapon, Vector &vecOrigin, QAngle &vecAngles );
 
 private:

src/game/shared/tf/tf_gamerules.cpp

@@ -93,8 +93,6 @@ ConVar tf_birthday( "tf_birthday", "0", FCVAR_NOTIFY | FCVAR_REPLICATED );
 ConVar tf2c_falldamage_disablespread( "tf2c_falldamage_disablespread", "0", FCVAR_REPLICATED | FCVAR_NOTIFY, "Toggles random 20% fall damage spread." );
 ConVar tf2c_allow_thirdperson( "tf2c_allow_thirdperson", "0", FCVAR_NOTIFY | FCVAR_REPLICATED, "Allow players to switch to third person mode." );
 
-ConVar tf2c_dm_spawnprotecttime( "tf2c_dm_spawnprotecttime", "5", FCVAR_REPLICATED | FCVAR_NOTIFY, "Time (in seconds) that the DM spawn protection lasts" );
-
 #ifdef GAME_DLL
 // TF overrides the default value of this convar
 ConVar mp_waitingforplayers_time( "mp_waitingforplayers_time", (IsX360()?"15":"30"), FCVAR_GAMEDLL | FCVAR_DEVELOPMENTONLY, "WaitingForPlayers time length in seconds" );
@@ -5304,25 +5302,6 @@ const char *CTFGameRules::GetGameDescription(void)
 	}
 }
 
-//-----------------------------------------------------------------------------
-// Purpose: 
-//-----------------------------------------------------------------------------
-void CTFGameRules::PlayerSpawn(CBasePlayer *pPlayer)
-{
-	BaseClass::PlayerSpawn(pPlayer);
-	if ( IsDeathmatch() )
-	{
-		CTFPlayer *pTFPlayer = ToTFPlayer(pPlayer);
-		float flSpawnProtectTime = gpGlobals->curtime + tf2c_dm_spawnprotecttime.GetFloat();
-		pTFPlayer->AddFlag( FL_GODMODE );
-		pTFPlayer->m_nRenderFX = kRenderFxExplode;
-		pTFPlayer->AddEffects( EF_ITEM_BLINK );
-		pTFPlayer->GetViewModel()->m_nRenderFX = kRenderFxExplode;
-		pTFPlayer->GetViewModel()->AddEffects( EF_ITEM_BLINK );
-		pTFPlayer->m_flSpawnProtectTime = flSpawnProtectTime;
-	}
-}
-
 #endif
 
 float CTFGameRules::GetRespawnWaveMaxLength( int iTeam, bool bScaleWithNumPlayers /* = true */ )

src/game/shared/tf/tf_gamerules.h

@@ -391,8 +391,6 @@ class CTFGameRules : public CTeamplayRoundBasedRules
 	void	SendHudNotification( IRecipientFilter &filter, HudNotification_t iType );
 	void	SendHudNotification( IRecipientFilter &filter, const char *pszText, const char *pszIcon, int iTeam = TEAM_UNASSIGNED );
 
-	virtual void PlayerSpawn( CBasePlayer *pPlayer );
-
 private:
 
 	int DefaultFOV( void ) { return 75; }

src/game/shared/tf/tf_player_shared.cpp

@@ -436,7 +436,8 @@ bool CTFPlayerShared::IsInvulnerable( void )
 	if ( InCond( TF_COND_INVULNERABLE ) ||
 		InCond( TF_COND_INVULNERABLE_HIDE_UNLESS_DAMAGE ) ||
 		InCond( TF_COND_INVULNERABLE_USER_BUFF ) ||
-		InCond( TF_COND_INVULNERABLE_CARD_EFFECT ) )
+		InCond( TF_COND_INVULNERABLE_CARD_EFFECT ) ||
+		InCond( TF_COND_INVULNERABLE_SPAWN_PROTECT ) )
 		return true;
 
 	return false;

src/game/shared/tf/tf_shareddefs.h

@@ -566,6 +566,7 @@ enum
 	// Add TF2C conds here
 	TF_COND_SMOKE_BOMB,
 	TF_COND_SLOWED,
+	TF_COND_INVULNERABLE_SPAWN_PROTECT,
 
 	// Powerup conditions
 	TF_COND_POWERUP_CRITDAMAGE,