X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=e15bc23b7e23c62251f9af84547d070bb3accc5a;hp=0195db43a432e17e1e472155995451a8f703160d;hb=69265650c1b6f1193cf02c99baccb28c0db913ed;hpb=bc3f297ed082b23fb33dd0d8f5dcd33bb0198507 diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 0195db43a4..e15bc23b7e 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -1,9 +1,13 @@ #include "announcer.qh" +#include +#include +#include #include - #include #include +#include +#include bool announcer_1min; bool announcer_5min; @@ -17,6 +21,40 @@ string AnnouncerOption() entity announcer_countdown; +/** + * Displays duel title; updates it if the players in-game have changed. + */ +string prev_pl1_name; +string prev_pl2_name; +void Announcer_Duel() +{ + Scoreboard_UpdatePlayerTeams(); + + entity pl1 = players.sort_next; + entity pl2 = pl1.sort_next; + string pl1_name = (pl1 && pl1.team != NUM_SPECTATOR ? entcs_GetName(pl1.sv_entnum) : "???"); + string pl2_name = (pl2 && pl2.team != NUM_SPECTATOR ? entcs_GetName(pl2.sv_entnum) : "???"); + + if(pl1_name == prev_pl1_name && pl2_name == prev_pl2_name) + return; // Players haven't changed, stop here + + strcpy(prev_pl1_name, pl1_name); + strcpy(prev_pl2_name, pl2_name); + + // There are new duelers, update title + centerprint_SetDuelTitle(pl1_name, pl2_name); +} + +void Announcer_ClearTitle() +{ + strfree(prev_pl1_name); + strfree(prev_pl2_name); + centerprint_ClearTitle(); +} + +bool prev_inround; +float prev_starttime; +float prev_roundstarttime; void Announcer_Countdown(entity this) { float starttime = STAT(GAMESTARTTIME); @@ -26,44 +64,56 @@ void Announcer_Countdown(entity this) Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP); delete(this); announcer_countdown = NULL; + Announcer_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 (starttime != prev_starttime || roundstarttime != prev_roundstarttime || prev_inround != inround) + this.skin = 0; // restart centerprint countdown + 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; + Announcer_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); + if(!prev_inround) Announcer_ClearTitle(); // clear title if we just started the match + if (!this.skin) // first tic + 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); + if (!this.skin) // first tic + 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)); + // Don't call centerprint countdown in the remaining tics, it will continue automatically. + // It's an optimization but also fixes ^COUNT shown in the last tic because of high slowmo values (15+). + // Hopefully it fixes ^COUNT occasionally shown in online servers, probably due to lags. + this.skin = 1; // recycled field } + + prev_inround = inround; + prev_starttime = starttime; + prev_roundstarttime = roundstarttime; } /** @@ -73,7 +123,7 @@ void Announcer_Countdown(entity this) * 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); @@ -82,9 +132,10 @@ void Announcer_Gamestart() startTime = roundstarttime; if(intermission) { + Announcer_ClearTitle(); if(announcer_countdown) { - centerprint_kill(ORDINAL(CPID_ROUND)); + centerprint_Kill(ORDINAL(CPID_ROUND)); if(announcer_countdown) { delete(announcer_countdown); @@ -94,6 +145,9 @@ void Announcer_Gamestart() return; } + if(announcer_countdown && gametype.m_1v1) + Announcer_Duel(); + if(previous_game_starttime != startTime) { if(time < startTime) @@ -104,18 +158,25 @@ void Announcer_Gamestart() 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)) + { + if (gametype.m_1v1) + Announcer_Duel(); + else + centerprint_SetTitle(strcat("^BG", MapInfo_Type_ToText(gametype))); // Show game type as 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; \ @@ -125,13 +186,29 @@ void Announcer_Gamestart() Local_Notification(MSG_ANNCE, ANNCE_REMAINING_MIN_##minute); \ } \ } \ -} MACRO_END +MACRO_END void Announcer_Time() { + static bool warmup_stage_prev; + if(intermission) return; + if (warmup_stage != warmup_stage_prev) + { + announcer_5min = announcer_1min = false; + warmup_stage_prev = warmup_stage; + return; + } + + float starttime = STAT(GAMESTARTTIME); + if(time < starttime) + { + announcer_5min = announcer_1min = false; + return; + } + float timeleft; if(warmup_stage) { @@ -142,7 +219,7 @@ void Announcer_Time() timeleft = 0; } else - timeleft = max(0, STAT(TIMELIMIT) * 60 + STAT(GAMESTARTTIME) - time); + timeleft = max(0, STAT(TIMELIMIT) * 60 + starttime - time); if(autocvar_cl_announcer_maptime >= 2) ANNOUNCER_CHECKMINUTE(5); @@ -153,6 +230,9 @@ void Announcer_Time() void Announcer() { + // announcer code sets gametype name as centerprint title + if(!gametype) + return; Announcer_Gamestart(); Announcer_Time(); }