From: z411 Date: Fri, 14 May 2021 22:24:23 +0000 (-0400) Subject: Fix overtime annce with sudden death X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44fac2b437df675be598236e5cfa79df9aaf9211;p=xonotic%2Fxonotic-data.pk3dir.git Fix overtime annce with sudden death --- diff --git a/qcsrc/client/hud/panel/spect.qc b/qcsrc/client/hud/panel/spect.qc index eb77d26eb..1f8c730e2 100644 --- a/qcsrc/client/hud/panel/spect.qc +++ b/qcsrc/client/hud/panel/spect.qc @@ -337,14 +337,14 @@ void HUD_SpectHUD() entity pl_right = pl_left.sort_next; // Left player - if(pl_left && (entcs_GetSpecState(pl_left.sv_entnum) != ENTCS_SPEC_PURE) { + if(pl_left && (entcs_GetSpecState(pl_left.sv_entnum)) != ENTCS_SPEC_PURE) { pos = panel_pos + vec2((vid_conwidth - 1) / 2, 0); pos.x -= (timer_width * 1.3) / 2; HUD_SpectHUD_drawDuelScore(pos, pl_left, true); } // Right player - if(pl_right && (entcs_GetSpecState(pl_right.sv_entnum) != ENTCS_SPEC_PURE) { + if(pl_right && (entcs_GetSpecState(pl_right.sv_entnum)) != ENTCS_SPEC_PURE) { pos = panel_pos + vec2((vid_conwidth - 1) / 2, 0); pos.x += (timer_width * 1.3) / 2; HUD_SpectHUD_drawDuelScore(pos, pl_right, false); diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc index e921b86b4..eaab11fe5 100644 --- a/qcsrc/server/world.qc +++ b/qcsrc/server/world.qc @@ -1741,8 +1741,9 @@ void CheckRules_World() Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_RACE_FINISHLAP); else Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_OVERTIME_FRAG); + checkrules_overtimesadded = 1; sound(NULL, CH_INFO, SND_OVERTIME, VOL_BASE, ATTN_NONE); - Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_SUDDENDEATH); + Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_OVERTIME); } } else