fix more tournament UI bugs

Author: mastercoms

src/game/client/tf/tf_hud_match_status.cpp

@@ -25,6 +25,7 @@
 #include "tf_match_description.h"
 #include "tf_hud_tournament.h"
 #include "tf_classmenu.h"
+#include "tf_hud_teamgoal_tournament.h"
 #include "tf_rating_data.h"
 
 extern ConVar mp_winlimit;
@@ -45,11 +46,17 @@ bool ShouldUseMatchHUD()
 #ifdef TF2_OG
 	return false;
 #else
-	if (TFGameRules() && TFGameRules()->IsMannVsMachineMode())
+	if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() )
 		return false;
 
+	if ( TFGameRules() && TFGameRules()->IsCompetitiveGame() && !TFGameRules()->IsInPlay() )
+	{
+		return false;
+	}
+
 	// TODO(mcoms): enforce this better
-	if ( TFGameRules() && ( TFGameRules()->IsMatchTypeCompetitive() || TFGameRules()->IsEmulatingMatch() == 2 ) )
+	C_TFPlayer* pTFPlayer = C_TFPlayer::GetLocalTFPlayer();
+	if ( TFGameRules() && ( TFGameRules()->IsMatchTypeCompetitive() || TFGameRules()->IsEmulatingMatch() == 2 ) && pTFPlayer && pTFPlayer->GetTeamNumber() >= FIRST_GAME_TEAM )
 		return true;
 
 	return tf_use_match_hud.GetBool();
@@ -484,6 +491,18 @@ void CTFHudMatchStatus::OnThink()
 		{
 			pKothHUD->InvalidateLayout( false, true );
 		}
+
+		CHudTeamGoalTournament *pGoalHUD = GET_HUDELEMENT( CHudTeamGoalTournament );
+		if ( pGoalHUD )
+		{
+			pGoalHUD->InvalidateLayout( false, true );
+		}
+
+		CHudStopWatch *pStopWatchHUD = GET_HUDELEMENT( CHudStopWatch );
+		if ( pStopWatchHUD )
+		{
+			pStopWatchHUD->InvalidateLayout( false, true );
+		}
 	}
 
 	// check for an active timer and turn the time panel on or off if we need to

src/game/client/tf/tf_hud_tournament.cpp

@@ -399,7 +399,7 @@ void CHudTournament::PreparePanel( void )
 
 			if ( m_bCountDownVisible )
 			{
-				g_pClientMode->GetViewportAnimationController()->StartAnimationSequence(this, m_bCompetitiveMode ? "HudTournament_ShowTimerCompetitive" : "HudTournament_ShowTimerDefault", false);
+				g_pClientMode->GetViewportAnimationController()->StartAnimationSequence( this, m_bCompetitiveMode || ( m_bReadyStatusMode && TFGameRules() && !TFGameRules()->IsMannVsMachineMode() ) ? "HudTournament_ShowTimerCompetitive" : "HudTournament_ShowTimerDefault", false );
 			}
 			else
 			{
@@ -791,7 +791,7 @@ void CHudTournament::PerformLayout( void )
 		}
 	}
 
-	bool bShowTournamentConditions = !m_bCompetitiveMode && TFGameRules() && !TFGameRules()->IsMannVsMachineMode();
+	bool bShowTournamentConditions = TFGameRules() && !TFGameRules()->IsCompetitiveGame();
 
 	// Hide some elements when in competitive mode
 	if ( m_pTournamentConditionLabel )

src/game/server/tf/tf_player.cpp

@@ -2349,7 +2349,7 @@ int CTFPlayer::CheckStrandedSpawn(void)
 	}
 
 	// or during pre-match / countdown
-	if ( !TFGameRules()->IsInPlay() || gpGlobals->curtime < TFGameRules()->GetPreroundCountdownTime() )
+	if ( !TFGameRules()->IsInPlay() || TFGameRules()->State_Get() == GR_STATE_PREROUND || gpGlobals->curtime < TFGameRules()->GetPreroundCountdownTime() )
 	{
 		return STRANDED_SPAWN_DETACHED;
 	}

src/game/shared/teamplayroundbased_gamerules.cpp

@@ -1928,7 +1928,7 @@ void CTeamplayRoundBasedRules::State_Think_RND_RUNNING( void )
 	CheckReadyRestart();
 
 #ifdef TF_DLL
-	if ( !TFGameRules()->IsMannVsMachineMode() && IsInTournamentMode() && !TFGameRules()->IsCommunityGameMode() )
+	if ( !TFGameRules()->IsMannVsMachineMode() && IsInPreMatch() && !TFGameRules()->IsCommunityGameMode() )
 	{
 		if ( TFGameRules()->UsePlayerReadyStatusMode() )
 		{
@@ -1940,7 +1940,7 @@ void CTeamplayRoundBasedRules::State_Think_RND_RUNNING( void )
 			}
 		}
 		// if we entered tournament mode but we're stuck without waiting for teams, then let's fix that.
-		else if ( IsInWaitingForPlayers() && GetRoundRestartTime() <= 0 && mp_restartround.GetInt() <= 0 && mp_restartgame.GetInt() <= 0 && !mp_restartgame_immediate.GetBool() && !m_bAwaitingReadyRestart )
+		else if ( GetRoundRestartTime() <= 0 && mp_restartround.GetInt() <= 0 && mp_restartgame.GetInt() <= 0 && !mp_restartgame_immediate.GetBool() && !m_bAwaitingReadyRestart )
 		{
 			m_bAwaitingReadyRestart = true;
 		}
@@ -2775,6 +2775,27 @@ void CC_CH_TournamentRestart( void )
 }
 static ConCommand mp_tournament_restart("mp_tournament_restart", CC_CH_TournamentRestart, "Restart Tournament Mode on the current level."  );
 
+void CC_CH_TournamentRefresh( void )
+{
+	if ( mp_tournament_allow_non_admin_restart.GetBool() == false )
+	{
+		if ( !UTIL_IsCommandIssuedByServerAdmin() )
+			return;
+	}
+
+#ifdef TF_DLL
+	if ( TFGameRules() && ( TFGameRules()->IsMannVsMachineMode() ) )
+		return;
+#endif // TF_DLL
+
+	CTeamplayRoundBasedRules* pRules = dynamic_cast<CTeamplayRoundBasedRules*>( GameRules() );
+	if ( pRules )
+	{
+		pRules->RestartTournament();
+	}
+}
+static ConCommand mp_tournament_legacy_refresh( "mp_tournament_stop_and_refresh", CC_CH_TournamentRefresh, "Refresh Tournament Mode on the current level, keeping the round largely intact. Provided for legacy mp_tournament_restart behavior." );
+
 void CTeamplayRoundBasedRules::RestartTournament( void )
 {
 	if ( IsInTournamentMode() == false )