X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=b53c04da052b048a233054639cbf659480d3cc34;hb=a2b044e8d47280d464523e889cfc206a105d1f4a;hp=dc4d7e2c5b0ff528afec43be43703ec71b74ca71;hpb=1ee77504702210cca8ee84e2b82f3dcf8f6fb537;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index dc4d7e2c5..b53c04da0 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,30 +1,12 @@
-float previous_announcement_time;
-float previous_game_starttime;
-string previous_announcement;
-
-// remaining maptime announcer sounds, true when sound was already played
 float announcer_1min;
 float announcer_5min;
-
-void Announcer_Play(string announcement)
-{
-	if((announcement != previous_announcement) || (time >= (previous_announcement_time + autocvar_cl_announcer_antispam)))
-	{
-		sound(world, CH_INFO, strcat("announcer/", autocvar_cl_announcer, "/", announcement, ".wav"), VOL_BASEVOICE, ATTN_NONE);
-
-		if(previous_announcement) { strunzone(previous_announcement); }
-		
-		previous_announcement = strzone(announcement);
-		previous_announcement_time = time;
-	}
-}
-
 void Announcer_Countdown() 
 {
 	float starttime = getstatf(STAT_GAMESTARTTIME);
 	float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
 	if(roundstarttime == -1)
 	{
+		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
 		remove(self);
 		return;
 	}
@@ -39,20 +21,22 @@ void Announcer_Countdown()
 	if(countdown <= 0) // countdown has finished, starttime is now
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN); 
-
-		Announcer_Play("begin");
+		Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN); 
 		remove(self);
 		return;
 	}
 	else // countdown is still going
 	{
 		if(roundstarttime == starttime)
+		{
 			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
+			Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded));
+		}
 		else
+		{
 			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
-
-		if(countdown_rounded <= 3 && countdown_rounded >= 1) 
-			Announcer_Play(ftos(countdown_rounded));
+			Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_GAMESTART, countdown_rounded));
+		}
 
 		self.nextthink = (starttime - (countdown - 1));
 	}
@@ -65,6 +49,7 @@ void Announcer_Countdown()
  * timelimit, fraglimit and game_starttime! Requires engine changes (remove STAT_TIMELIMIT
  * and STAT_FRAGLIMIT to be auto-sent)
  */
+ float previous_game_starttime;
 void Announcer_Gamestart() 
 {
 	float startTime = getstatf(STAT_GAMESTARTTIME);
@@ -75,13 +60,17 @@ void Announcer_Gamestart()
 	if(previous_game_starttime != startTime) 
 	{
 		if((time + 5.0) < startTime) // if connecting to server while restart was active don't always play prepareforbattle
-			Announcer_Play("prepareforbattle");
+			Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
 
 		if(time < startTime) 
 		{
-			entity e;
-			e = spawn();
-			e.think = Announcer_Countdown;
+			entity e = find(world, classname, "announcer_countdown");
+			if not(e)
+			{
+				e = spawn();
+				e.classname = "announcer_countdown";
+				e.think = Announcer_Countdown;
+			}
 			e.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime
 		}
 	}
@@ -120,7 +109,7 @@ void Announcer_Time()
 				if not(autocvar_g_warmup_limit == -1 && warmup_stage) 
 				{
 					announcer_5min = TRUE;
-					Announcer_Play("5minutesremain");
+					Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_5);
 				}
 			}
 		}
@@ -142,7 +131,7 @@ void Announcer_Time()
 			if not(autocvar_g_warmup_limit == -1 && warmup_stage) 
 			{
 				announcer_1min = TRUE;
-				Announcer_Play("1minuteremains");
+				Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_1);
 			}
 		}
 	}
@@ -153,50 +142,3 @@ void Announcer()
 	Announcer_Gamestart();
 	Announcer_Time();
 }
-
-void Announcer_Precache () 
-{
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/1minuteremains.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/5minutesremain.wav"));
-
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/electrobitch.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/airshot.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/03kills.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/05kills.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/10kills.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/15kills.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/20kills.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/25kills.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/30kills.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/botlike.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/yoda.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/amazing.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/awesome.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/impressive.wav"));
-
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/prepareforbattle.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/begin.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/timeoutcalled.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/1fragleft.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/2fragsleft.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/3fragsleft.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/terminated.wav"));
-
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/1.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/2.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/3.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/4.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/5.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/6.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/7.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/8.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/9.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/10.wav"));
-
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/lastsecond.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/narrowly.wav"));
-
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/voteaccept.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/votecall.wav"));
-	precache_sound (strcat("announcer/", autocvar_cl_announcer, "/votefail.wav"));
-}