strafehud: properly prevent jump height being carried over after respawn

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / timer.qc

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index 10d10c45ddac1ba180958bd022d44725b8832242..8bb4ade6a17f49aca0f69be10c5ffa303069af2f 100644 (file)
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -6,6 +6,11 @@
 
 // Timer (#5)
 
+void HUD_Timer_Export(int fh)
+{
+       // allow saving cvars that aesthetically change the panel into hud skin files
+}
+
 void HUD_Timer()
 {
        if(!autocvar__hud_configure)
@@ -61,10 +66,10 @@ void HUD_Timer()
        else
                timer_color = '1 0 0'; //red
 
-       if (warmup_stage && warmup_timeleft >= 60) {
-               timer = _("WARMUP");
-       } else if (intermission_time) {
+       if (intermission_time) {
                timer = seconds_tostring(max(0, floor(intermission_time - STAT(GAMESTARTTIME))));
+       } else if (warmup_stage && warmup_timeleft >= 60) {
+               timer = _("WARMUP");
        } 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