fix setup time / miniround regression

Author: mastercoms

src/game/shared/teamplayroundbased_gamerules.cpp

@@ -1641,8 +1641,13 @@ void CTeamplayRoundBasedRules::State_Enter_PREROUND( void )
 #ifdef TF_DLL
 	if ( ( TFGameRules()->IsCompetitiveMode() || TFGameRules()->IsEmulatingMatch() ) && GetRoundsPlayed() == 0 && !m_bAllowBetweenRounds )
 	{
-		// we already did a round respawn in this case.
-		bDoRoundRespawn = false;
+		CTeamControlPointMaster* pMaster = g_hControlPointMasters.Count() ? g_hControlPointMasters[0] : NULL;
+		bool bPlayedMiniRound = pMaster && pMaster->PlayingMiniRounds();
+		if ( !bPlayedMiniRound && !( GetActiveRoundTimer() && ( GetActiveRoundTimer()->GetSetupTimeLength() > 0 ) ) )
+		{
+			// we already did a round respawn in this case.
+			bDoRoundRespawn = false;
+		}
 	}
 #endif
 	if ( bDoRoundRespawn )
@@ -1866,9 +1871,17 @@ void CTeamplayRoundBasedRules::CheckReadyRestart( void )
 					return;
 				}
 			}
-			else if ( !TFGameRules()->IsCompetitiveMode() && !TFGameRules()->IsEmulatingMatch() && mp_tournament.GetBool() )
+			else if ( TFGameRules()->IsCompetitiveMode() || TFGameRules()->IsEmulatingMatch() )
+			{
+				// otherwise, we handled this during m_flCompModeRespawnPlayersAtMatchStart
+				if ( !TFGameRules()->IsPreRoundPushEnabled() )
+				{
+					TFGameRules()->StartCompetitiveMatch();
+				}
+				return;
+			}
+			else if ( mp_tournament.GetBool() )
 			{
-				// for matches, we handle this during m_flCompModeRespawnPlayersAtMatchStart
 				if ( mp_tournament_prevent_team_switch_on_readyup.GetBool() )
 				{
 					TFGameRules()->SetSwitchTeams( false );

src/game/shared/tf/tf_gamerules.cpp

@@ -9430,9 +9430,12 @@ void CTFGameRules::Think()
 			{
 				if ( ( State_Get() == GR_STATE_BETWEEN_RNDS || State_Get() == GR_STATE_PREROUND ) && ( GetRoundsPlayed() == 0 ) )
 				{
-					ShouldResetScores( true, true );
-					ShouldResetRoundsPlayed( true );
-					StartCompetitiveMatch();
+					if ( IsPreRoundPushEnabled() )
+					{
+						ShouldResetScores( true, true );
+						ShouldResetRoundsPlayed( true );
+						StartCompetitiveMatch();
+					}
 					SpawnMatchBots();
 				}