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

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index e15bc23b7..077a1c6d0 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -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();
@@ -130,7 +130,7 @@ void Announcer_Gamestart()
 	float roundstarttime = STAT(ROUNDSTARTTIME);
 	if(roundstarttime > startTime)
 		startTime = roundstarttime;
-	if(intermission)
+	if(intermission || warmup_stage)
 	{
 		Announcer_ClearTitle();
 		if(announcer_countdown)
@@ -214,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;
 	}