From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 15 Nov 2011 20:45:16 +0000 (+0200)
Subject: Don't show crosshair and run helper voice either while rebooting
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7c27ecc7cefb5a63f297b29cfe8a47fb62720231;p=voretournament%2Fvoretournament.git

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 1f2edf68..5c8a5f5f 100644
--- a/data/qcsrc/client/Defs.qc
+++ b/data/qcsrc/client/Defs.qc
@@ -245,3 +245,5 @@ float ticrate;
 // only for Porto
 float angles_held_status;
 vector angles_held;
+
+float power_boot;
diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index abe99a14..0b3600e1 100644
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -300,7 +300,7 @@ void CSQC_UpdateView(float w, float h)
 
 	// helper system
 	if(cvar("cl_helper"))
-	if not(getstati(STAT_ARMOR) < g_power)
+	if not(getstati(STAT_ARMOR) < g_power && time > power_boot)
 	{
 		if(intermission || respawned || spectatee_status < 0 || getstati(STAT_HEALTH) <= 0 || getstati(STAT_VORE_EATEN))
 		{
@@ -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"));
 
 	if not(getstati(STAT_VORE_EATEN)) // crosshair is useless if we're in the stomach
-	if not(getstati(STAT_ARMOR) < g_power)
+	if not(getstati(STAT_ARMOR) < g_power && time > power_boot)
 	{
 		// crosshair goes VERY LAST
 		if(!scoreboard_active && !ons_showmap && !camera_active) {
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index a7c6e570..0371c39b 100644
--- 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;
 float vote_change; // "time" when vote_active changed
 
-float power_boot;
-
 vector stomachstatus_colorfade_current;
 vector StomachStatus_ColorFade(vector target_color)
 {
@@ -3093,7 +3091,7 @@ void Sbar_Draw (void)
 				power_boot = time + g_power_reboot;
 				return;
 			}
-			else if(time < power_boot)
+			else if(time <= power_boot)
 			{
 				drawpic(warn_pos - '128 0 0', "gfx/hud/sb_power_reboot", '256 256 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 				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);