X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=4ad25b3fd865618c2027922f6cb6b1d5f009a551;hb=39e2b0cfdc761f22e772b1b93db79f48a2ebca44;hp=62b732bec25034e773801113d86aa9f268bfcbf4;hpb=9185b58da6fe5f2b095d7066577e1e024b4d2798;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 62b732bec..4ad25b3fd 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -1,6 +1,6 @@ #include "announcer.qh" -#include "mutators/events.qh" +#include #include #include @@ -115,7 +115,7 @@ void Announcer_Gamestart() previous_game_starttime = startTime; } -#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN { \ +#define ANNOUNCER_CHECKMINUTE(minute) MACRO_BEGIN \ if(announcer_##minute##min) { \ if(timeleft > minute * 60) \ announcer_##minute##min = false; \ @@ -125,10 +125,13 @@ void Announcer_Gamestart() Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \ } \ } \ -} MACRO_END +MACRO_END void Announcer_Time() { + if(intermission) + return; + float timeleft; if(warmup_stage) {