#include "mutators/events.qh"
-#include <common/notifications.qh>
+#include <common/notifications/all.qh>
#include <common/stats.qh>
bool announcer_1min;
if(roundstarttime == starttime)
{
Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
- Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded));
+ Notification annce_num = Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded);
+ if(annce_num != NULL)
+ Local_Notification(MSG_ANNCE, annce_num);
}
else
{
Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
- Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_GAMESTART, countdown_rounded));
+ Notification annce_num = Announcer_PickNumber(CNT_GAMESTART, countdown_rounded);
+ if(annce_num != NULL)
+ Local_Notification(MSG_ANNCE, Announcer_PickNumber(CNT_GAMESTART, countdown_rounded));
}
this.nextthink = (starttime - (countdown - 1));
float roundstarttime = STAT(ROUNDSTARTTIME);
if(roundstarttime > startTime)
startTime = roundstarttime;
+ if(intermission)
+ {
+ if(announcer_countdown)
+ {
+ centerprint_kill(ORDINAL(CPID_ROUND));
+ if(announcer_countdown)
+ {
+ remove(announcer_countdown);
+ announcer_countdown = NULL;
+ }
+ }
+ return;
+ }
if(previous_game_starttime != startTime)
{