#include "announcer.qh"
-#include "mutators/events.qh"
+#include <client/mutators/_mod.qh>
#include <common/notifications/all.qh>
#include <common/stats.qh>
{
string ret = autocvar_cl_announcer;
MUTATOR_CALLHOOK(AnnouncerOption, ret);
- ret = ret_string;
+ ret = M_ARGV(0, string);
return ret;
}
entity announcer_countdown;
-void Announcer_Countdown()
+void Announcer_Countdown(entity this)
{
- SELFPARAM();
float starttime = STAT(GAMESTARTTIME);
float roundstarttime = STAT(ROUNDSTARTTIME);
if(roundstarttime == -1)
{
Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
- remove(this);
+ delete(this);
announcer_countdown = NULL;
return;
}
{
Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
- remove(this);
+ delete(this);
announcer_countdown = NULL;
return;
}
{
Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
Notification annce_num = Announcer_PickNumber(CNT_GAMESTART, countdown_rounded);
- if(annce_num != NULL)
+ if(annce_num != NULL)
Local_Notification(MSG_ANNCE, annce_num);
}
centerprint_kill(ORDINAL(CPID_ROUND));
if(announcer_countdown)
{
- remove(announcer_countdown);
+ delete(announcer_countdown);
announcer_countdown = NULL;
}
}
if (!announcer_countdown)
{
announcer_countdown = new(announcer_countdown);
- announcer_countdown.think = Announcer_Countdown;
+ setthink(announcer_countdown, Announcer_Countdown);
}
if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle
previous_game_starttime = startTime;
}
+#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN \
+ if(announcer_##minute##min) { \
+ if(timeleft > minute * 60) \
+ announcer_##minute##min = false; \
+ } else { \
+ if(timeleft < minute * 60 && timeleft > minute * 60 - 1) { \
+ announcer_##minute##min = true; \
+ Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \
+ } \
+ } \
+MACRO_END
-// Plays the 1 minute or 5 minutes (of maptime) remaining sound, if client wants it
void Announcer_Time()
{
- float timelimit = STAT(TIMELIMIT);
- float timeleft = max(0, timelimit * 60 + STAT(GAMESTARTTIME) - time);
+ if(intermission)
+ return;
+ float timeleft;
if(warmup_stage)
{
float warmup_timelimit = STAT(WARMUP_TIMELIMIT);
else
timeleft = 0;
}
+ else
+ timeleft = max(0, STAT(TIMELIMIT) * 60 + STAT(GAMESTARTTIME) - time);
- // 5 minute check
if(autocvar_cl_announcer_maptime >= 2)
- {
- // make sure that after connect (and e.g. 4 minutes left) we will not get a wrong sound
- if(announcer_5min)
- {
- if(timeleft > 300)
- announcer_5min = false;
- }
- else
- {
- if(timeleft < 300 && timeleft > 299)
- {
- announcer_5min = true;
- Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_5);
- }
- }
- }
+ ANNOUNCER_CHECKMINUTE(5);
- // 1 minute check
if((autocvar_cl_announcer_maptime == 1) || (autocvar_cl_announcer_maptime == 3))
- {
- if(announcer_1min)
- {
- if(timeleft > 60)
- announcer_1min = false;
- }
- else
- {
- if(timeleft < 60 && timeleft > 59)
- {
- announcer_1min = true;
- Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_1);
- }
- }
- }
+ ANNOUNCER_CHECKMINUTE(1);
}
void Announcer()