#include "announcer.qh"
+#include <client/hud/panel/centerprint.qh>
#include <client/mutators/_mod.qh>
-
#include <common/notifications/all.qh>
#include <common/stats.qh>
+#include <common/mapinfo.qh>
bool announcer_1min;
bool announcer_5min;
Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
delete(this);
announcer_countdown = NULL;
+ centerprint_ClearTitle();
return;
}
- if(roundstarttime >= starttime)
- starttime = roundstarttime;
if(starttime <= time && roundstarttime != starttime) // game start time has passed
announcer_5min = announcer_1min = false; // reset maptime announcers now as well
- float countdown = (starttime - time);
+ bool inround = (roundstarttime && time >= starttime);
+ float countdown = (inround ? roundstarttime - time : starttime - time);
float countdown_rounded = floor(0.5 + countdown);
+ if(time >= starttime) centerprint_ClearTitle();
+
if(countdown <= 0) // countdown has finished, starttime is now
{
Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
delete(this);
announcer_countdown = NULL;
+ centerprint_ClearTitle();
return;
}
else // countdown is still going
{
- // if concomitant countdown to round start overrides countdown to game start
- if(roundstarttime == starttime)
+ if(inround)
{
- Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
+ Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, STAT(ROUNDS_PLAYED) + 1, countdown_rounded);
Notification annce_num = Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded);
if(annce_num != NULL)
Local_Notification(MSG_ANNCE, annce_num);
+ this.nextthink = (roundstarttime - (countdown - 1));
}
else
{
Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
Notification annce_num = Announcer_PickNumber(CNT_GAMESTART, countdown_rounded);
- if(annce_num != NULL)
+ if(!roundstarttime && annce_num != NULL) // Don't announce game start in round based modes
Local_Notification(MSG_ANNCE, annce_num);
+ this.nextthink = (starttime - (countdown - 1));
}
-
- this.nextthink = (starttime - (countdown - 1));
}
}
* timelimit, fraglimit and game_starttime! Requires engine changes (remove STAT_TIMELIMIT
* and STAT_FRAGLIMIT to be auto-sent)
*/
- float previous_game_starttime;
+float previous_game_starttime;
void Announcer_Gamestart()
{
float startTime = STAT(GAMESTARTTIME);
{
if(announcer_countdown)
{
- centerprint_kill(ORDINAL(CPID_ROUND));
+ centerprint_Kill(ORDINAL(CPID_ROUND));
if(announcer_countdown)
{
delete(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 > announcer_countdown.nextthink) // don't play it again if countdown was already going
- Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
+ if(!warmup_stage && time < STAT(GAMESTARTTIME))
+ {
+ centerprint_SetTitle(MapInfo_Type_ToText(gametype)); // Set centerprint title
+ if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle
+ Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
+ }
- announcer_countdown.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime
+ announcer_countdown.nextthink = startTime - floor(startTime - time + 0.5); //synchronize nextthink to startTime
}
}
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; \
Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \
} \
} \
-} MACRO_END
+MACRO_END
void Announcer_Time()
{