Don't show crosshair and run helper voice either while rebooting

diff --git a/data/qcsrc/client/Defs.qc b/data/qcsrc/client/Defs.qc
index 1f2edf68bbee691a43b3c1779309a657fc2de0d4..5c8a5f5f071b8102d6106a6f0f3278963c94b68c 100644 (file)
--- a/data/qcsrc/client/Defs.qc
+++ b/data/qcsrc/client/Defs.qc
@@ -245,3 +245,5 @@ float ticrate;
 // only for Porto\r
 float angles_held_status;\r
 vector angles_held;\r
+\r
+float power_boot;\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index abe99a1447477dabd6cc522aad61e520e45f24dd..0b3600e1ad3824cfc203491db2e550303167ca60 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -300,7 +300,7 @@ void CSQC_UpdateView(float w, float h)
 \r
        // helper system\r
        if(cvar("cl_helper"))\r
-       if not(getstati(STAT_ARMOR) < g_power)\r
+       if not(getstati(STAT_ARMOR) < g_power && time > power_boot)\r
        {\r
                if(intermission || respawned || spectatee_status < 0 || getstati(STAT_HEALTH) <= 0 || getstati(STAT_VORE_EATEN))\r
                {\r
@@ -1159,7 +1159,7 @@ void CSQC_UpdateView(float w, float h)
                localcmd(strcat("bf ", cvar_string("cl_flash_respawn_color"), " ", cvar_string("cl_flash_respawn"), "\n"));\r
 \r
        if not(getstati(STAT_VORE_EATEN)) // crosshair is useless if we're in the stomach\r
-       if not(getstati(STAT_ARMOR) < g_power)\r
+       if not(getstati(STAT_ARMOR) < g_power && time > power_boot)\r
        {\r
                // crosshair goes VERY LAST\r
                if(!scoreboard_active && !ons_showmap && !camera_active) {\r

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index a7c6e570a65101af9e793003c247f54b23c396c3..0371c39b4157ee7cbaf29e00698991dfd3002ce5 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2784,8 +2784,6 @@ float vote_prev; // previous state of vote_active to check for a change
 float vote_alpha;\r
 float vote_change; // "time" when vote_active changed\r
 \r
-float power_boot;\r
-\r
 vector stomachstatus_colorfade_current;\r
 vector StomachStatus_ColorFade(vector target_color)\r
 {\r
@@ -3093,7 +3091,7 @@ void Sbar_Draw (void)
                                power_boot = time + g_power_reboot;\r
                                return;\r
                        }\r
-                       else if(time < power_boot)\r
+                       else if(time <= power_boot)\r
                        {\r
                                drawpic(warn_pos - '128 0 0', "gfx/hud/sb_power_reboot", '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                drawpic(warn_pos - '16 0 0' + '0 150 0', "gfx/hud/sb_power_reboot_icon", '32 32 0', '1 1 1', sbar_alpha_fg * (0.5 + sin(time * 5) / 2), DRAWFLAG_NORMAL);\r