Implement #798

Author: Bitl

src/game/client/tf/tf_hud_tournament.cpp

@@ -35,6 +35,9 @@
 #include "c_tf_objective_resource.h"
 #include "tf_time_panel.h"
 #include "tf_hud_match_status.h"
+#ifdef BDSBASE
+#include "engine/IEngineSound.h"
+#endif
 
 #include "tf_gc_client.h"
 #include "tf_lobby_server.h"
@@ -109,7 +112,7 @@ CHudTournament::~CHudTournament()
 	{
 		m_pPlayerPanelKVs->deleteThis();
 		m_pPlayerPanelKVs = NULL;
-	}
+	}                      
 }
 
 //-----------------------------------------------------------------------------
@@ -142,6 +145,12 @@ void CHudTournament::PlaySounds( int nTime )
 
 	bool bCompetitiveMode = TFGameRules() && TFGameRules()->IsCompetitiveMode();
 
+#ifdef BDSBASE
+	bool bAdminCanTalk = gpGlobals->curtime > m_flNextActionTime;
+#else
+	bool bAdminCanTalk = true;
+#endif
+
 	switch( nTime )
 	{
 		case 60:
@@ -162,32 +171,60 @@ void CHudTournament::PlaySounds( int nTime )
 		}
 		case 10:
 		{
+#ifdef BDSBASE
+			const char* pszEntryName = "";
+#endif
 			if ( TFGameRules() && TFGameRules()->IsMannVsMachineMode() )
 			{
 				if ( TFObjectiveResource()->GetMannVsMachineWaveCount() >= TFObjectiveResource()->GetMannVsMachineMaxWaveCount() )
 				{
+#ifdef BDSBASE
+					pszEntryName = UTIL_GetRandomSoundFromEntry("Announcer.MVM_Final_Wave_Start");
+#else
 					pLocalPlayer->EmitSound( "Announcer.MVM_Final_Wave_Start" );
+#endif
 				}
 				else if ( TFObjectiveResource()->GetMannVsMachineWaveCount() <= 1 )
 				{
 					if ( GTFGCClientSystem()->GetLobby() && IsMannUpGroup( GTFGCClientSystem()->GetLobby()->GetMatchGroup() ) )
 					{
+#ifdef BDSBASE
+						pszEntryName = UTIL_GetRandomSoundFromEntry("Announcer.MVM_Manned_Up");
+#else
 						pLocalPlayer->EmitSound( "Announcer.MVM_Manned_Up" );
+#endif
 					}
 					else
 					{
+#ifdef BDSBASE
+						pszEntryName = UTIL_GetRandomSoundFromEntry("Announcer.MVM_First_Wave_Start");
+#else
 						pLocalPlayer->EmitSound( "Announcer.MVM_First_Wave_Start" );
+#endif
 					}
 				}
 				else
 				{
+#ifdef BDSBASE
+					pszEntryName = UTIL_GetRandomSoundFromEntry("Announcer.MVM_Wave_Start");
+#else
 					pLocalPlayer->EmitSound( "Announcer.MVM_Wave_Start" );
+#endif
 				}
 			}
 			else
 			{
+#ifdef BDSBASE
+				pszEntryName = UTIL_GetRandomSoundFromEntry(bCompetitiveMode ? "Announcer.CompGame1Begins10Seconds" : "Announcer.RoundBegins10Seconds");
+#else
 				pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGame1Begins10Seconds" : "Announcer.RoundBegins10Seconds" );
+#endif
 			}
+#ifdef BDSBASE
+			float flDelay = enginesound->GetSoundDuration(pszEntryName); // Pulling sound length
+			pLocalPlayer->EmitSound(pszEntryName); // Playing sound
+			m_flNextActionTime = gpGlobals->curtime + flDelay; // Determining min time for admin to not talk over herself
+#endif
 			break;
 		}
 		case 9:
@@ -227,27 +264,27 @@ void CHudTournament::PlaySounds( int nTime )
 		}
 		case 5:
 		{
-			pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins05Seconds" : "Announcer.RoundBegins5Seconds" );
+			if (bAdminCanTalk) pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins05Seconds" : "Announcer.RoundBegins5Seconds" );
 			break;
 		}
 		case 4:
 		{
-			pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins04Seconds" : "Announcer.RoundBegins4Seconds" );
+			if (bAdminCanTalk) pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins04Seconds" : "Announcer.RoundBegins4Seconds" );
 			break;
 		}
 		case 3:
 		{
-			pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins03Seconds" : "Announcer.RoundBegins3Seconds" );
+			if (bAdminCanTalk) pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins03Seconds" : "Announcer.RoundBegins3Seconds" );
 			break;
 		}
 		case 2:
 		{
-			pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins02Seconds" : "Announcer.RoundBegins2Seconds" );
+			if (bAdminCanTalk) pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins02Seconds" : "Announcer.RoundBegins2Seconds" );
 			break;
 		}
 		case 1:
 		{
-			pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins01Seconds" : "Announcer.RoundBegins1Seconds" );
+			if (bAdminCanTalk) pLocalPlayer->EmitSound( bCompetitiveMode ? "Announcer.CompGameBegins01Seconds" : "Announcer.RoundBegins1Seconds" );
 			break;
 		}
 	}

src/game/client/tf/tf_hud_tournament.h

@@ -60,6 +60,9 @@ class CHudTournament : public CHudElement, public EditablePanel
 	bool			m_bShouldBeVisible;
 
 	float			m_flNextUpdate;
+#ifdef BDSBASE
+	float			m_flNextActionTime;	// new addition for bugfix
+#endif
 
 	bool			m_bTeamReady[MAX_TEAMS];