X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=077a1c6d012ecb97f68f95fc15f00cad0d06ff9a;hb=bf7f5c0b22733002fbde9ac642ef3d9b9274aba0;hp=1bbf900375e025f66f059202f7eae6c5b826b50d;hpb=ccf1757e6a71d864249ebe4f3cd13331529bcb41;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 1bbf90037..077a1c6d0 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,6 +64,7 @@ void Announcer_Countdown(entity this) Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP); delete(this); announcer_countdown = NULL; + Announcer_ClearTitle(); return; } @@ -33,19 +72,25 @@ void Announcer_Countdown(entity this) 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); + Local_Notification(MSG_MULTI, COUNTDOWN_BEGIN); delete(this); announcer_countdown = NULL; + Announcer_ClearTitle(); return; } else // countdown is still going { 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); @@ -53,13 +98,22 @@ void Announcer_Countdown(entity this) } 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(!roundstarttime && annce_num != NULL) // Don't announce game start in round based modes Local_Notification(MSG_ANNCE, annce_num); 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; } /** @@ -69,15 +123,16 @@ 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); float roundstarttime = STAT(ROUNDSTARTTIME); if(roundstarttime > startTime) startTime = roundstarttime; - if(intermission) + if(intermission || warmup_stage) { + Announcer_ClearTitle(); if(announcer_countdown) { centerprint_Kill(ORDINAL(CPID_ROUND)); @@ -90,6 +145,9 @@ void Announcer_Gamestart() return; } + if(announcer_countdown && gametype.m_1v1) + Announcer_Duel(); + if(previous_game_starttime != startTime) { if(time < startTime) @@ -100,9 +158,16 @@ 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 + 0.5); //synchronize nextthink to startTime } @@ -149,7 +214,7 @@ void Announcer_Time() { float warmup_timelimit = STAT(WARMUP_TIMELIMIT); if(warmup_timelimit > 0) - timeleft = max(0, warmup_timelimit - time); + timeleft = max(0, warmup_timelimit + starttime - time); else timeleft = 0; } @@ -165,6 +230,9 @@ void Announcer_Time() void Announcer() { + // announcer code sets gametype name as centerprint title + if(!gametype) + return; Announcer_Gamestart(); Announcer_Time(); }