X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=077a1c6d012ecb97f68f95fc15f00cad0d06ff9a;hb=bf7f5c0b22733002fbde9ac642ef3d9b9274aba0;hp=59f977818748240387cc9cca1bc569093a9623d4;hpb=a4649ea0e37c5fcc186c5f315a97af7205e29760;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 59f977818..077a1c6d0 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -42,8 +42,7 @@ void Announcer_Duel()
 	strcpy(prev_pl2_name, pl2_name);
 
 	// There are new duelers, update title
-	float offset = stringwidth(pl2_name, true, hud_fontsize) - stringwidth(pl1_name, true, hud_fontsize) - 1;
-	centerprint_SetTitle(sprintf("^BG%s^BG  %s  %s", pl1_name, _("vs"), pl2_name), offset / 2);
+	centerprint_SetDuelTitle(pl1_name, pl2_name);
 }
 
 void Announcer_ClearTitle()
@@ -54,6 +53,8 @@ void Announcer_ClearTitle()
 }
 
 bool prev_inround;
+float prev_starttime;
+float prev_roundstarttime;
 void Announcer_Countdown(entity this)
 {
 	float starttime = STAT(GAMESTARTTIME);
@@ -71,10 +72,13 @@ void Announcer_Countdown(entity this)
 	float countdown = (inround ? roundstarttime - time : starttime - time);
 	float countdown_rounded = floor(0.5 + countdown);
 
+	if (starttime != prev_starttime || roundstarttime != prev_roundstarttime || prev_inround != inround)
+		this.skin = 0; // restart centerprint countdown
+
 	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();
@@ -85,7 +89,8 @@ void Announcer_Countdown(entity this)
 		if(inround)
 		{
 			if(!prev_inround) Announcer_ClearTitle(); // clear title if we just started the match
-			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, STAT(ROUNDS_PLAYED) + 1, countdown_rounded);
+			if (!this.skin) // first tic
+				Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, STAT(ROUNDS_PLAYED) + 1, countdown_rounded);
 			Notification annce_num = Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded);
 			if(annce_num != NULL)
 				Local_Notification(MSG_ANNCE, annce_num);
@@ -93,15 +98,22 @@ void Announcer_Countdown(entity this)
 		}
 		else
 		{
-			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
+			if (!this.skin) // first tic
+				Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
 			Notification annce_num = Announcer_PickNumber(CNT_GAMESTART, countdown_rounded);
 			if(!roundstarttime && annce_num != NULL) // Don't announce game start in round based modes
 				Local_Notification(MSG_ANNCE, annce_num);
 			this.nextthink = (starttime - (countdown - 1));
 		}
+		// Don't call centerprint countdown in the remaining tics, it will continue automatically.
+		// It's an optimization but also fixes ^COUNT shown in the last tic because of high slowmo values (15+).
+		// Hopefully it fixes ^COUNT occasionally shown in online servers, probably due to lags.
+		this.skin = 1; // recycled field
 	}
 
 	prev_inround = inround;
+	prev_starttime = starttime;
+	prev_roundstarttime = roundstarttime;
 }
 
 /**
@@ -118,8 +130,9 @@ void Announcer_Gamestart()
 	float roundstarttime = STAT(ROUNDSTARTTIME);
 	if(roundstarttime > startTime)
 		startTime = roundstarttime;
-	if(intermission)
+	if(intermission || warmup_stage)
 	{
+		Announcer_ClearTitle();
 		if(announcer_countdown)
 		{
 			centerprint_Kill(ORDINAL(CPID_ROUND));
@@ -150,7 +163,7 @@ void Announcer_Gamestart()
 				if (gametype.m_1v1)
 					Announcer_Duel();
 				else
-					centerprint_SetTitle(strcat("^BG", MapInfo_Type_ToText(gametype)), 0); // Show game type as title
+					centerprint_SetTitle(strcat("^BG", MapInfo_Type_ToText(gametype))); // Show game type as title
 
 				if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle
 					Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
@@ -201,7 +214,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;
 	}
@@ -217,6 +230,9 @@ void Announcer_Time()
 
 void Announcer()
 {
+	// announcer code sets gametype name as centerprint title
+	if(!gametype)
+		return;
 	Announcer_Gamestart();
 	Announcer_Time();
 }