#include "mutators/events.qh"
-#include "../common/notifications.qh"
-#include "../common/stats.qh"
+#include <common/notifications/all.qh>
+#include <common/stats.qh>
bool announcer_1min;
bool announcer_5min;
{
SELFPARAM();
float starttime = STAT(GAMESTARTTIME);
- float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
+ float roundstarttime = STAT(ROUNDSTARTTIME);
if(roundstarttime == -1)
{
Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
void Announcer_Gamestart()
{
float startTime = STAT(GAMESTARTTIME);
- float roundstarttime = getstatf(STAT_ROUNDSTARTTIME);
+ 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)
{
// Plays the 1 minute or 5 minutes (of maptime) remaining sound, if client wants it
void Announcer_Time()
{
- float timelimit = getstatf(STAT_TIMELIMIT);
+ float timelimit = STAT(TIMELIMIT);
float timeleft = max(0, timelimit * 60 + STAT(GAMESTARTTIME) - time);
float warmup_timeleft = 0;