From: z411 <z411@omaera.org>
Date: Sun, 20 Mar 2022 03:30:29 +0000 (-0300)
Subject: Merge branch 'master' into z411/new_centerprint
X-Git-Tag: xonotic-v0.8.5~128^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be7b82718ba0084b8cc85f5d7439fdec95594b93;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into z411/new_centerprint
---

be7b82718ba0084b8cc85f5d7439fdec95594b93
diff --cc qcsrc/client/announcer.qc
index 58c2727f7,1bbf90037..64606a684
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@@ -27,11 -26,8 +27,9 @@@ void Announcer_Countdown(entity this
  		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
  		delete(this);
  		announcer_countdown = NULL;
 +		centerprint_ClearTitle();
  		return;
  	}
- 	if(starttime <= time && roundstarttime != starttime) // game start time has passed
- 		announcer_5min = announcer_1min = false; // reset maptime announcers now as well
  
  	bool inround = (roundstarttime && time >= starttime);
  	float countdown = (inround ? roundstarttime - time : starttime - time);