From 56c6e9450b6f1d54be10d1a4a796aacda462190e Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 16 Sep 2016 18:36:59 +0200 Subject: [PATCH] gameover_time --> intermission_time --- qcsrc/client/defs.qh | 2 +- qcsrc/client/hud/panel/timer.qc | 6 +++--- qcsrc/client/view.qc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qcsrc/client/defs.qh b/qcsrc/client/defs.qh index 182f6ace7..3d515d32e 100644 --- a/qcsrc/client/defs.qh +++ b/qcsrc/client/defs.qh @@ -120,7 +120,7 @@ int serverflags; float uid2name_dialog; -float gameover_time; +float intermission_time; .bool csqcmodel_isdead; // used by shownames and miscfunctions (entcs_IsDead) to know when a player is dead diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc index fab0392dc..45f46b408 100644 --- a/qcsrc/client/hud/panel/timer.qc +++ b/qcsrc/client/hud/panel/timer.qc @@ -50,15 +50,15 @@ void HUD_Timer() } vector timer_color; - if(gameover_time || minutesLeft >= 5 || warmup_stage || timelimit == 0) + if(intermission_time || minutesLeft >= 5 || warmup_stage || timelimit == 0) timer_color = '1 1 1'; //white else if(minutesLeft >= 1) timer_color = '1 1 0'; //yellow else timer_color = '1 0 0'; //red - if (gameover_time) { - timer = seconds_tostring(max(0, floor(gameover_time - STAT(GAMESTARTTIME)))); + if (intermission_time) { + timer = seconds_tostring(max(0, floor(intermission_time - STAT(GAMESTARTTIME)))); } else if (autocvar_hud_panel_timer_increment || (!warmup_stage && timelimit == 0) || (warmup_stage && warmup_timeleft <= 0)) { if (time < STAT(GAMESTARTTIME)) timer = seconds_tostring(0); //while restart is still active, show 00:00 diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 1e6103891..ad28f70e5 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1743,8 +1743,8 @@ void CSQC_UpdateView(entity this, float w, float h) if(!postinit) PostInit(); - if(intermission && !gameover_time) - gameover_time = time; + if(intermission && !intermission_time) + intermission_time = time; if(intermission && !isdemo() && !(calledhooks & HOOK_END)) { -- 2.39.2