X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=62b732bec25034e773801113d86aa9f268bfcbf4;hb=c039d054a46888048d214000273ccfc63e4611b6;hp=8f477171cec19286cf96efafc40b5517f97fdfe4;hpb=28305c2245f99ca5ae21ea8858e05c6bb0a2000b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 8f477171c..62b732bec 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -1,20 +1,31 @@ #include "announcer.qh" -#include "_all.qh" -#include "../common/notifications.qh" -#include "../common/stats.qh" -#include "../common/util.qh" +#include "mutators/events.qh" + +#include +#include bool announcer_1min; bool announcer_5min; -void Announcer_Countdown() -{SELFPARAM(); - float starttime = getstatf(STAT_GAMESTARTTIME); - float roundstarttime = getstatf(STAT_ROUNDSTARTTIME); +string AnnouncerOption() +{ + string ret = autocvar_cl_announcer; + MUTATOR_CALLHOOK(AnnouncerOption, ret); + ret = M_ARGV(0, string); + return ret; +} + +entity announcer_countdown; + +void Announcer_Countdown(entity this) +{ + float starttime = STAT(GAMESTARTTIME); + float roundstarttime = STAT(ROUNDSTARTTIME); if(roundstarttime == -1) { Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP); - remove(self); + delete(this); + announcer_countdown = NULL; return; } if(roundstarttime >= starttime) @@ -29,7 +40,8 @@ void Announcer_Countdown() { Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN); Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN); - remove(self); + delete(this); + announcer_countdown = NULL; return; } else // countdown is still going @@ -38,15 +50,19 @@ void Announcer_Countdown() 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, annce_num); } - self.nextthink = (starttime - (countdown - 1)); + this.nextthink = (starttime - (countdown - 1)); } } @@ -60,91 +76,76 @@ void Announcer_Countdown() float previous_game_starttime; void Announcer_Gamestart() { - float startTime = getstatf(STAT_GAMESTARTTIME); - float roundstarttime = getstatf(STAT_ROUNDSTARTTIME); + float startTime = STAT(GAMESTARTTIME); + float roundstarttime = STAT(ROUNDSTARTTIME); if(roundstarttime > startTime) startTime = roundstarttime; + if(intermission) + { + if(announcer_countdown) + { + centerprint_kill(ORDINAL(CPID_ROUND)); + if(announcer_countdown) + { + delete(announcer_countdown); + announcer_countdown = NULL; + } + } + return; + } if(previous_game_starttime != startTime) { if(time < startTime) { - entity e = find(world, classname, "announcer_countdown"); - if (!e) + if (!announcer_countdown) { - e = spawn(); - e.classname = "announcer_countdown"; - e.think = Announcer_Countdown; + announcer_countdown = new(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 - if(time > e.nextthink) // don't play it again if countdown was already going + if(time > announcer_countdown.nextthink) // don't play it again if countdown was already going Local_Notification(MSG_ANNCE, ANNCE_PREPARE); - e.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime + announcer_countdown.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime } } 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 = getstatf(STAT_TIMELIMIT); - float timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time); - float warmup_timeleft = 0; - + float timeleft; if(warmup_stage) - if(autocvar_g_warmup_limit > 0) - warmup_timeleft = max(0, autocvar_g_warmup_limit + getstatf(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(((!warmup_stage || autocvar_g_warmup_limit == 0) && timeleft > 300) - || (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft > 300)) - announcer_5min = false; - } + float warmup_timelimit = STAT(WARMUP_TIMELIMIT); + if(warmup_timelimit > 0) + timeleft = max(0, warmup_timelimit - time); else - { - if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timelimit > 0 && timeleft < 300 && timeleft > 299) - || (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft < 300 && warmup_timeleft > 299)) - { - //if we're in warmup mode, check whether there's a warmup timelimit - if(!(autocvar_g_warmup_limit == -1 && warmup_stage)) - { - announcer_5min = true; - Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_5); - } - } - } + timeleft = 0; } + else + timeleft = max(0, STAT(TIMELIMIT) * 60 + STAT(GAMESTARTTIME) - time); + + if(autocvar_cl_announcer_maptime >= 2) + ANNOUNCER_CHECKMINUTE(5); - // 1 minute check if((autocvar_cl_announcer_maptime == 1) || (autocvar_cl_announcer_maptime == 3)) - { - if (announcer_1min) - { - if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timeleft > 60) - || (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft > 60)) - announcer_1min = false; - } - else if(((!warmup_stage || autocvar_g_warmup_limit == 0) && timelimit > 0 && timeleft < 60) - || (warmup_stage && autocvar_g_warmup_limit > 0 && warmup_timeleft < 60)) - { - // if we're in warmup mode, check whether there's a warmup timelimit - if(!(autocvar_g_warmup_limit == -1 && warmup_stage)) - { - announcer_1min = true; - Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_1); - } - } - } + ANNOUNCER_CHECKMINUTE(1); } void Announcer()