From: terencehill <piuntn@gmail.com>
Date: Fri, 13 Nov 2015 17:28:27 +0000 (+0100)
Subject: Fix missing countdown messages and announcements when a round is starting. Fixes... 
X-Git-Tag: xonotic-v0.8.2~1666^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b12657e7cd60c43a9ead10ff2f912a064ec37a9b;p=xonotic%2Fxonotic-data.pk3dir.git

Fix missing countdown messages and announcements when a round is starting. Fixes #1589
---

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index fa8f2b005..6fcdbb9d6 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -15,6 +15,8 @@ string AnnouncerOption()
 	return ret;
 }
 
+entity announcer_countdown;
+
 void Announcer_Countdown()
 {
 	SELFPARAM();
@@ -24,6 +26,7 @@ void Announcer_Countdown()
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
 		remove(this);
+		announcer_countdown = NULL;
 		return;
 	}
 	if(roundstarttime >= starttime)
@@ -39,6 +42,7 @@ void Announcer_Countdown()
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
 		Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
 		remove(this);
+		announcer_countdown = NULL;
 		return;
 	}
 	else // countdown is still going
@@ -78,7 +82,6 @@ void Announcer_Gamestart()
 	{
 		if(time < startTime)
 		{
-			static entity announcer_countdown;
 			if (!announcer_countdown)
 			{
 				announcer_countdown = new(announcer_countdown);