X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=cc85f31ccab7b62ee8fc9bfadcb55e47db795b8f;hb=c624e64397b1ac7cbe3b2128a732d2f762443db3;hp=d46595e8718bde0a2007fb276a6e54ab6b49d7ca;hpb=90908cc793110f8c34a83aaf0e4d700ac90e87b2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index d46595e87..cc85f31cc 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -42,7 +42,7 @@ void Announcer_Duel()
 	strcpy(prev_pl2_name, pl2_name);
 
 	// There are new duelers, update title
-	centerprint_SetDuelTitle(pl1_name, pl2_name, _("vs"));
+	centerprint_SetDuelTitle(pl1_name, pl2_name);
 }
 
 void Announcer_ClearTitle()
@@ -78,7 +78,7 @@ void Announcer_Countdown(entity this)
 	if(countdown <= 0) // countdown has finished, starttime is now
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
-		Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
+		Local_Notification(MSG_MULTI, COUNTDOWN_BEGIN);
 		delete(this);
 		announcer_countdown = NULL;
 		Announcer_ClearTitle();
@@ -128,19 +128,16 @@ void Announcer_Gamestart()
 {
 	float startTime = STAT(GAMESTARTTIME);
 	float roundstarttime = STAT(ROUNDSTARTTIME);
-	if(roundstarttime > startTime)
+	if(time > startTime && roundstarttime > startTime)
 		startTime = roundstarttime;
-	if(intermission)
+	if(intermission || warmup_stage)
 	{
-		Announcer_ClearTitle();
 		if(announcer_countdown)
 		{
+			Announcer_ClearTitle();
 			centerprint_Kill(ORDINAL(CPID_ROUND));
-			if(announcer_countdown)
-			{
-				delete(announcer_countdown);
-				announcer_countdown = NULL;
-			}
+			delete(announcer_countdown);
+			announcer_countdown = NULL;
 		}
 		return;
 	}
@@ -154,7 +151,7 @@ void Announcer_Gamestart()
 		{
 			if (!announcer_countdown)
 			{
-				announcer_countdown = new(announcer_countdown);
+				announcer_countdown = new_pure(announcer_countdown);
 				setthink(announcer_countdown, Announcer_Countdown);
 			}
 
@@ -214,7 +211,7 @@ void Announcer_Time()
 	{
 		float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
 		if(warmup_timelimit > 0)
-			timeleft = max(0, warmup_timelimit - time);
+			timeleft = max(0, warmup_timelimit + starttime - time);
 		else
 			timeleft = 0;
 	}