perf: optimize HUD animation scoping

mastercoms · mastercoms · commit a25d3a1d395e · 2023-04-16T10:43:53.000-04:00
diff --git a/src/game/client/game_controls/MapOverview.cpp b/src/game/client/game_controls/MapOverview.cpp
@@ -1019,7 +1019,7 @@ void CMapOverview::SetMode(int mode)
 	{
 		ShowPanel( false );
 
-		g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "MapOff" );
+		g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "MapOff", true, true );
 	}
 	else if ( mode == MAP_MODE_INSET )
 	{
@@ -1041,7 +1041,7 @@ void CMapOverview::SetMode(int mode)
 
 		if ( mode != m_nMode && RunHudAnimations() )
 		{
-			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "MapZoomToSmall" );
+			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "MapZoomToSmall", true, true );
 		}
 	}
 	else if ( mode == MAP_MODE_FULL )
@@ -1061,7 +1061,7 @@ void CMapOverview::SetMode(int mode)
 
 		if ( mode != m_nMode && RunHudAnimations() )
 		{
-			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "MapZoomToLarge" );
+			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "MapZoomToLarge", true, true );
 		}
 	}
 
diff --git a/src/game/client/hud_base_account.cpp b/src/game/client/hud_base_account.cpp
@@ -28,7 +28,7 @@ void CHudBaseAccount::LevelInit( void )
 	m_pszLastAnimationName = NULL;
 	m_pszQueuedAnimationName = NULL;
 
-	GetAnimationController()->StartAnimationSequence("AccountMoneyInvisible");
+	GetAnimationController()->StartAnimationSequence(this, "AccountMoneyInvisible", true, true);
 }
 
 void CHudBaseAccount::ApplySchemeSettings(vgui::IScheme *pScheme)
@@ -91,14 +91,14 @@ void CHudBaseAccount::Paint()
 		{
 			m_pszLastAnimationName = "AccountMoneyAdded";
 		}
-		GetAnimationController()->StartAnimationSequence( m_pszLastAnimationName );
+		GetAnimationController()->StartAnimationSequence( this, m_pszLastAnimationName, true, true );
 		m_flLastAnimationEnd = gpGlobals->curtime + GetAnimationController()->GetAnimationSequenceLength( m_pszLastAnimationName );
 
 		m_iPreviousAccount = account;
 	}
 	else if ( m_pszQueuedAnimationName )
 	{
-		GetAnimationController()->StartAnimationSequence( m_pszQueuedAnimationName );
+		GetAnimationController()->StartAnimationSequence( this, m_pszQueuedAnimationName, true, true );
 		m_pszQueuedAnimationName = NULL;
 	}
 
diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp
@@ -256,12 +256,12 @@ void CHudMenu::SelectMenuItem( int menu_item )
 
 		m_nSelectedItem = menu_item;
 		// Pulse the selection
-		g_pClientMode->GetViewportAnimationController()->StartAnimationSequence("MenuPulse");
+		g_pClientMode->GetViewportAnimationController()->StartAnimationSequence(this, "MenuPulse", true, true);
 
 		// remove the menu quickly
 		m_bMenuTakesInput = false;
 		m_flShutoffTime = gpGlobals->realtime + m_flOpenCloseTime;
-		g_pClientMode->GetViewportAnimationController()->StartAnimationSequence("MenuClose");
+		g_pClientMode->GetViewportAnimationController()->StartAnimationSequence(this, "MenuClose", true, true);
 	}
 }
 
@@ -365,7 +365,7 @@ void CHudMenu::HideMenu( void )
 {
 	m_bMenuTakesInput = false;
 	m_flShutoffTime = gpGlobals->realtime + m_flOpenCloseTime;
-	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence("MenuClose");
+	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence(this, "MenuClose", true, true);
 }
 
 //-----------------------------------------------------------------------------
@@ -384,7 +384,7 @@ void CHudMenu::ShowMenu( const char * menuName, int validSlots )
 
 	Q_strncpy( g_szPrelocalisedMenuString, menuName, sizeof( g_szPrelocalisedMenuString ) );
 
-	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence("MenuOpen");
+	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence(this, "MenuOpen", true, true);
 	m_nSelectedItem = -1;
 
 	// we have the whole string, so we can localise it now
@@ -409,7 +409,7 @@ void CHudMenu::ShowMenu_KeyValueItems( KeyValues *pKV )
 	m_fWaitingForMore = 0;
 	m_bitsValidSlots = 0;
 
-	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence("MenuOpen");
+	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence(this, "MenuOpen", true, true);
 	m_nSelectedItem = -1;
 	
 	g_szMenuString[0] = '\0';
@@ -489,7 +489,7 @@ void CHudMenu::MsgFunc_ShowMenu( bf_read &msg)
 
 		if ( !NeedMore )
 		{  
-			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence("MenuOpen");
+			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence(this, "MenuOpen", true, true);
 			m_nSelectedItem = -1;
 			
 			// we have the whole string, so we can localise it now
diff --git a/src/game/client/tf/tf_hud_arena_vs_panel.cpp b/src/game/client/tf/tf_hud_arena_vs_panel.cpp
@@ -121,7 +121,7 @@ void CHudArenaVsPanel::FireGameEvent( IGameEvent * event )
 
 		if ( m_bVisible )
 		{
-			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "ArenaVsPanelOnShow" );			
+			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "ArenaVsPanelOnShow", true, true );	
 
 			m_flHideTime = gpGlobals->curtime + 10.0f;
 
diff --git a/src/game/client/tf/tf_hud_flagstatus.cpp b/src/game/client/tf/tf_hud_flagstatus.cpp
@@ -507,7 +507,7 @@ void CTFHudFlagObjectives::ApplySchemeSettings( IScheme *pScheme )
 //-----------------------------------------------------------------------------
 void CTFHudFlagObjectives::Reset()
 {
-	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "FlagOutlineHide" );
+	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "FlagOutlineHide", true, true );
 
 	UpdateStatus();
 }
@@ -834,7 +834,7 @@ void CTFHudFlagObjectives::UpdateStatus( C_BasePlayer *pNewOwner /*= NULL*/, C_B
 		if ( !m_bFlagAnimationPlayed )
 		{
 			m_bFlagAnimationPlayed = true;
-			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "FlagOutline" );
+			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "FlagOutline", true, true );
 		}
 
 		if ( m_pCapturePoint && !m_pCapturePoint->IsVisible() )
@@ -864,7 +864,7 @@ void CTFHudFlagObjectives::UpdateStatus( C_BasePlayer *pNewOwner /*= NULL*/, C_B
 		if ( m_bCarryingFlag )
 		{
 			m_bCarryingFlag = false;
-			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "FlagOutline" );
+			g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "FlagOutline", true, true );
 		}
 
 		m_bFlagAnimationPlayed = false;
diff --git a/src/game/client/tf/tf_hud_pve_winpanel.cpp b/src/game/client/tf/tf_hud_pve_winpanel.cpp
@@ -167,7 +167,7 @@ void CTFPVEWinPanel::OnTick()
 				// Do this only once
 				if ( bRespecVisible && !m_pRespecBackground->IsVisible() )
 				{
-					g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "RespecEarnedPulseLoss" );
+					g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( m_pRespecContainerPanel, "RespecEarnedPulseLoss", true, true );
 				
 					C_TFPlayer *pLocalTFPlayer = C_TFPlayer::GetLocalTFPlayer();
 					if ( pLocalTFPlayer )
diff --git a/src/game/client/tf/tf_hud_robot_destruction_status.cpp b/src/game/client/tf/tf_hud_robot_destruction_status.cpp
@@ -14,6 +14,7 @@
 #include "tf_logic_player_destruction.h"
 #include "c_tf_objective_resource.h"
 #include "c_func_capture_zone.h"
+#include "tf_hud_objectivestatus.h"
 
 #define ATTACK_BLINK_TIME 2.f
 
@@ -516,7 +517,8 @@ void CTFHUDRobotDestruction::PerformRobotLayout( RobotVector_t& vecRobots, int n
 //-----------------------------------------------------------------------------
 void CTFHUDRobotDestruction::Reset()
 {
-	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "FlagOutlineHide" );
+	CTFHudObjectiveStatus *pStatus = GET_HUDELEMENT( CTFHudObjectiveStatus );
+	g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( pStatus, "FlagOutlineHide" );
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/game/shared/teamplay_round_timer.cpp b/src/game/shared/teamplay_round_timer.cpp
@@ -97,10 +97,13 @@ static void RecvProxy_TimerPaused( const CRecvProxyData *pData, void *pStruct, v
 
 	bool bTimerPaused = ( pData->m_Value.m_Int > 0 );
 
+	// UNDONE: Unused HUD animation
+#if 0
 	if ( bTimerPaused == false )
 	{
 		g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "TimerFlash" ); 
 	}
+#endif
 
 	if ( pTimer )
 	{
diff --git a/src/game/shared/tf/tf_gamemovement.cpp b/src/game/shared/tf/tf_gamemovement.cpp
@@ -314,7 +314,7 @@ void CTFGameMovement::ProcessMovement( CBasePlayer *pBasePlayer, CMoveData *pMov
 	mv = pMove;
 
 	// The max speed is currently set to the scout - if this changes we need to change this!
-	mv->m_flMaxSpeed = TF_MAX_SPEED;
+	mv->m_flMaxSpeed = tf_movement_maxspeed.GetFloat();
 
 	// Handle charging demomens
 	ChargeMove();
diff --git a/src/public/vgui_controls/AnimationController.h b/src/public/vgui_controls/AnimationController.h
@@ -50,7 +50,7 @@ class AnimationController : public Panel
 
 	// starts an animation sequence script
 	bool StartAnimationSequence(const char *sequenceName, bool bCanBeCancelled = true );
-	bool StartAnimationSequence(Panel *pWithinParent, const char *sequenceName, bool bCanBeCancelled = true );
+	bool StartAnimationSequence(Panel *pWithinParent, const char *sequenceName, bool bCanBeCancelled = true, bool bIncludeParent = false );
 
 	bool StopAnimationSequence( Panel *pWithinParent, const char *sequenceName );
 	void CancelAnimationsForPanel( Panel *pWithinParent );
@@ -241,14 +241,14 @@ class AnimationController : public Panel
 	CUtlVector<UtlSymId_t>	m_ScriptFileNames;
 
 	// runs a single line of the script
-	void ExecAnimationCommand(UtlSymId_t seqName, AnimCommand_t &animCommand, Panel *pWithinParent, bool bCanBeCancelled);
+	void ExecAnimationCommand(UtlSymId_t seqName, AnimCommand_t &animCommand, Panel *pWithinParent, bool bCanBeCancelled, bool bIncludeParent = false);
 	// removes all commands belonging to a script
 	void RemoveQueuedAnimationCommands(UtlSymId_t seqName, vgui::Panel *panel = NULL);
 	// removes an existing instance of a command
 	void RemoveQueuedAnimationByType(vgui::Panel *panel, UtlSymId_t variable, UtlSymId_t sequenceToIgnore);
 
 	// handlers
-	void StartCmd_Animate(UtlSymId_t seqName, AnimCmdAnimate_t &cmd, Panel *pWithinParent, bool bCanBeCancelled);
+	void StartCmd_Animate(UtlSymId_t seqName, AnimCmdAnimate_t &cmd, Panel *pWithinParent, bool bCanBeCancelled, bool bIncludeParent = false);
 	void StartCmd_Animate(Panel *panel, UtlSymId_t seqName, AnimCmdAnimate_t &cmd, bool bCanBeCancelled);
 	void RunCmd_RunEvent(PostedMessage_t &msg);
 	void RunCmd_StopEvent(PostedMessage_t &msg);
diff --git a/src/vgui2/vgui_controls/AnimationController.cpp b/src/vgui2/vgui_controls/AnimationController.cpp
@@ -1042,7 +1042,7 @@ bool AnimationController::StartAnimationSequence(const char *sequenceName, bool
 //-----------------------------------------------------------------------------
 // Purpose: starts an animation sequence script
 //-----------------------------------------------------------------------------
-bool AnimationController::StartAnimationSequence(Panel *pWithinParent, const char *sequenceName, bool bCanBeCancelled )
+bool AnimationController::StartAnimationSequence(Panel *pWithinParent, const char *sequenceName, bool bCanBeCancelled, bool bIncludeParent )
 {
 	Assert( pWithinParent );
 
@@ -1075,7 +1075,7 @@ bool AnimationController::StartAnimationSequence(Panel *pWithinParent, const cha
 	// execute the sequence
 	for (int cmdIndex = 0; cmdIndex < m_Sequences[i].cmdList.Count(); cmdIndex++)
 	{
-		ExecAnimationCommand(seqName, m_Sequences[i].cmdList[cmdIndex], pWithinParent, bCanBeCancelled);
+		ExecAnimationCommand(seqName, m_Sequences[i].cmdList[cmdIndex], pWithinParent, bCanBeCancelled, bIncludeParent);
 	}
 
 	return true;	
@@ -1277,11 +1277,11 @@ void AnimationController::RemoveQueuedAnimationByType(vgui::Panel *panel, UtlSym
 //-----------------------------------------------------------------------------
 // Purpose: runs a single line of the script
 //-----------------------------------------------------------------------------
-void AnimationController::ExecAnimationCommand(UtlSymId_t seqName, AnimCommand_t &animCommand, Panel *pWithinParent, bool bCanBeCancelled)
+void AnimationController::ExecAnimationCommand(UtlSymId_t seqName, AnimCommand_t &animCommand, Panel *pWithinParent, bool bCanBeCancelled, bool bIncludeParent)
 {
 	if (animCommand.commandType == CMD_ANIMATE)
 	{
-		StartCmd_Animate(seqName, animCommand.cmdData.animate, pWithinParent, bCanBeCancelled);
+		StartCmd_Animate(seqName, animCommand.cmdData.animate, pWithinParent, bCanBeCancelled, bIncludeParent);
 	}
 	else
 	{
@@ -1301,19 +1301,21 @@ void AnimationController::ExecAnimationCommand(UtlSymId_t seqName, AnimCommand_t
 //-----------------------------------------------------------------------------
 // Purpose: starts a variable animation
 //-----------------------------------------------------------------------------
-void AnimationController::StartCmd_Animate(UtlSymId_t seqName, AnimCmdAnimate_t &cmd, Panel *pWithinParent, bool bCanBeCancelled)
+void AnimationController::StartCmd_Animate(UtlSymId_t seqName, AnimCmdAnimate_t &cmd, Panel *pWithinParent, bool bCanBeCancelled, bool bIncludeParent)
 {
 	Assert( pWithinParent );
 	if ( !pWithinParent )
 		return;
 
+	const char* panelName = g_ScriptSymbols.String(cmd.panel);
+
 	// make sure the child exists
-	Panel *panel = pWithinParent->FindChildByName(g_ScriptSymbols.String(cmd.panel),true);
+	Panel *panel = pWithinParent->FindChildByName(panelName,true);
 	if ( !panel )
 	{
 		// Check the parent
-		Panel *parent = GetParent();
-		if ( !Q_stricmp( parent->GetName(), g_ScriptSymbols.String(cmd.panel) ) )
+		Panel *parent = bIncludeParent ? pWithinParent : GetParent();
+		if ( !Q_stricmp( parent->GetName(), panelName ) )
 		{
 			panel = parent;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1019,7 +1019,7 @@ void CMapOverview::SetMode(int mode)`
`1019`	`1019`	`{`
`1020`	`1020`	`ShowPanel( false );`
`1021`	`1021`
`1022`		`- g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "MapOff" );`
	`1022`	`+ g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "MapOff", true, true );`
`1023`	`1023`	`}`
`1024`	`1024`	`else if ( mode == MAP_MODE_INSET )`
`1025`	`1025`	`{`
`@@ -1041,7 +1041,7 @@ void CMapOverview::SetMode(int mode)`
`1041`	`1041`
`1042`	`1042`	`if ( mode != m_nMode && RunHudAnimations() )`
`1043`	`1043`	`{`
`1044`		`- g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "MapZoomToSmall" );`
	`1044`	`+ g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "MapZoomToSmall", true, true );`
`1045`	`1045`	`}`
`1046`	`1046`	`}`
`1047`	`1047`	`else if ( mode == MAP_MODE_FULL )`
`@@ -1061,7 +1061,7 @@ void CMapOverview::SetMode(int mode)`
`1061`	`1061`
`1062`	`1062`	`if ( mode != m_nMode && RunHudAnimations() )`
`1063`	`1063`	`{`
`1064`		`- g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "MapZoomToLarge" );`
	`1064`	`+ g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "MapZoomToLarge", true, true );`
`1065`	`1065`	`}`
`1066`	`1066`	`}`
`1067`	`1067`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ void CHudBaseAccount::LevelInit( void )`
`28`	`28`	`m_pszLastAnimationName = NULL;`
`29`	`29`	`m_pszQueuedAnimationName = NULL;`
`30`	`30`
`31`		`- GetAnimationController()->StartAnimationSequence("AccountMoneyInvisible");`
	`31`	`+ GetAnimationController()->StartAnimationSequence(this, "AccountMoneyInvisible", true, true);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`void CHudBaseAccount::ApplySchemeSettings(vgui::IScheme *pScheme)`
`@@ -91,14 +91,14 @@ void CHudBaseAccount::Paint()`
`91`	`91`	`{`
`92`	`92`	`m_pszLastAnimationName = "AccountMoneyAdded";`
`93`	`93`	`}`
`94`		`- GetAnimationController()->StartAnimationSequence( m_pszLastAnimationName );`
	`94`	`+ GetAnimationController()->StartAnimationSequence( this, m_pszLastAnimationName, true, true );`
`95`	`95`	`m_flLastAnimationEnd = gpGlobals->curtime + GetAnimationController()->GetAnimationSequenceLength( m_pszLastAnimationName );`
`96`	`96`
`97`	`97`	`m_iPreviousAccount = account;`
`98`	`98`	`}`
`99`	`99`	`else if ( m_pszQueuedAnimationName )`
`100`	`100`	`{`
`101`		`- GetAnimationController()->StartAnimationSequence( m_pszQueuedAnimationName );`
	`101`	`+ GetAnimationController()->StartAnimationSequence( this, m_pszQueuedAnimationName, true, true );`
`102`	`102`	`m_pszQueuedAnimationName = NULL;`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ void CHudArenaVsPanel::FireGameEvent( IGameEvent * event )`
`121`	`121`
`122`	`122`	`if ( m_bVisible )`
`123`	`123`	`{`
`124`		`- g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "ArenaVsPanelOnShow" );`
	`124`	`+ g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "ArenaVsPanelOnShow", true, true );`
`125`	`125`
`126`	`126`	`m_flHideTime = gpGlobals->curtime + 10.0f;`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ void CTFHudFlagObjectives::ApplySchemeSettings( IScheme *pScheme )`
`507`	`507`	`//-----------------------------------------------------------------------------`
`508`	`508`	`void CTFHudFlagObjectives::Reset()`
`509`	`509`	`{`
`510`		`- g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "FlagOutlineHide" );`
	`510`	`+ g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "FlagOutlineHide", true, true );`
`511`	`511`
`512`	`512`	`UpdateStatus();`
`513`	`513`	`}`
`@@ -834,7 +834,7 @@ void CTFHudFlagObjectives::UpdateStatus( C_BasePlayer pNewOwner /= NULL*/, C_B`
`834`	`834`	`if ( !m_bFlagAnimationPlayed )`
`835`	`835`	`{`
`836`	`836`	`m_bFlagAnimationPlayed = true;`
`837`		`- g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "FlagOutline" );`
	`837`	`+ g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "FlagOutline", true, true );`
`838`	`838`	`}`
`839`	`839`
`840`	`840`	`if ( m_pCapturePoint && !m_pCapturePoint->IsVisible() )`
`@@ -864,7 +864,7 @@ void CTFHudFlagObjectives::UpdateStatus( C_BasePlayer pNewOwner /= NULL*/, C_B`
`864`	`864`	`if ( m_bCarryingFlag )`
`865`	`865`	`{`
`866`	`866`	`m_bCarryingFlag = false;`
`867`		`- g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "FlagOutline" );`
	`867`	`+ g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, "FlagOutline", true, true );`
`868`	`868`	`}`
`869`	`869`
`870`	`870`	`m_bFlagAnimationPlayed = false;`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ void CTFPVEWinPanel::OnTick()`
`167`	`167`	`// Do this only once`
`168`	`168`	`if ( bRespecVisible && !m_pRespecBackground->IsVisible() )`
`169`	`169`	`{`
`170`		`- g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "RespecEarnedPulseLoss" );`
	`170`	`+ g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( m_pRespecContainerPanel, "RespecEarnedPulseLoss", true, true );`
`171`	`171`
`172`	`172`	`C_TFPlayer *pLocalTFPlayer = C_TFPlayer::GetLocalTFPlayer();`
`173`	`173`	`if ( pLocalTFPlayer )`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`#include "tf_logic_player_destruction.h"`
`15`	`15`	`#include "c_tf_objective_resource.h"`
`16`	`16`	`#include "c_func_capture_zone.h"`
	`17`	`+#include "tf_hud_objectivestatus.h"`
`17`	`18`
`18`	`19`	`#define ATTACK_BLINK_TIME 2.f`
`19`	`20`
`@@ -516,7 +517,8 @@ void CTFHUDRobotDestruction::PerformRobotLayout( RobotVector_t& vecRobots, int n`
`516`	`517`	`//-----------------------------------------------------------------------------`
`517`	`518`	`void CTFHUDRobotDestruction::Reset()`
`518`	`519`	`{`
`519`		`- g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "FlagOutlineHide" );`
	`520`	`+ CTFHudObjectiveStatus *pStatus = GET_HUDELEMENT( CTFHudObjectiveStatus );`
	`521`	`+ g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( pStatus, "FlagOutlineHide" );`
`520`	`522`	`}`
`521`	`523`
`522`	`524`	`//-----------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,13 @@ static void RecvProxy_TimerPaused( const CRecvProxyData pData, void pStruct, v`
`97`	`97`
`98`	`98`	`bool bTimerPaused = ( pData->m_Value.m_Int > 0 );`
`99`	`99`
	`100`	`+ // UNDONE: Unused HUD animation`
	`101`	`+#if 0`
`100`	`102`	`if ( bTimerPaused == false )`
`101`	`103`	`{`
`102`	`104`	`g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( "TimerFlash" );`
`103`	`105`	`}`
	`106`	`+#endif`
`104`	`107`
`105`	`108`	`if ( pTimer )`
`106`	`109`	`{`