]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
gameover_time --> intermission_time
authorterencehill <piuntn@gmail.com>
Fri, 16 Sep 2016 16:36:59 +0000 (18:36 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 16 Sep 2016 16:36:59 +0000 (18:36 +0200)
qcsrc/client/defs.qh
qcsrc/client/hud/panel/timer.qc
qcsrc/client/view.qc

index 182f6ace743c71437f9a9f6fb6d323abf6bf21cc..3d515d32eaf59cf2429010909dc910c98cad24ea 100644 (file)
@@ -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
 
index fab0392dc08938d19dd27046faf608e9f1241931..45f46b4087ad35da1c4cff70aabe9799a40463f6 100644 (file)
@@ -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
index 1e61038915f42816ae0e678575038455d5236abb..ad28f70e53e4ef061c974f403e80f454741e53aa 100644 (file)
@@ -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))
        {