X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FView.qc;h=0381845ffdd2366898185e85d0a6ac1344329d19;hp=ea257312ac85206139a4a19849e4d28111daf20e;hb=02990abeb6b6bba0059e812a1b78e67f6febffba;hpb=fe8c7510919a64ff76afde8eb94bbb29bf293c3b

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index ea257312ac..0381845ffd 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -698,6 +698,18 @@ void CSQC_UpdateView(float w, float h)
 
 		// crosshair goes VERY LAST
 		if(!scoreboard_active && !camera_active && intermission != 2) {
+			string wcross_style;
+			float wcross_alpha, wcross_resolution;
+			wcross_style = cvar_string("crosshair");
+			if (wcross_style == "0")
+				return;
+			wcross_resolution = cvar("crosshair_size");
+			if (wcross_resolution == 0)
+				return;
+			wcross_alpha = cvar("crosshair_color_alpha");
+			if (wcross_alpha == 0)
+				return;
+
 			// TrueAim check
 			float shottype;
 			float bullets, ring_scale;
@@ -723,24 +735,26 @@ void CSQC_UpdateView(float w, float h)
 			else
 				shottype = SHOTTYPE_HITWORLD;
 
-			string wcross_style;
-			wcross_style = cvar_string("crosshair");
-
 			if (wcross_style != "0") {
 				vector wcross_color, wcross_size;
 				string wcross_wep, wcross_name;
-				float wcross_alpha, wcross_scale, wcross_blur, wcross_resolution;
+				float wcross_scale, wcross_blur;
 
 				wcross_color_x = cvar("crosshair_color_red");
 				wcross_color_y = cvar("crosshair_color_green");
 				wcross_color_z = cvar("crosshair_color_blue");
-				wcross_alpha = cvar("crosshair_color_alpha");
-				wcross_resolution = cvar("crosshair_size");
 				if (cvar("crosshair_per_weapon")) {
 					e = get_weaponinfo(activeweapon);
 					if (e && e.netname != "")
 					{
 						wcross_wep = e.netname;
+						wcross_resolution *= cvar(strcat("crosshair_", wcross_wep, "_size"));
+						if (wcross_resolution == 0)
+							return;
+						wcross_alpha *= cvar(strcat("crosshair_", wcross_wep, "_color_alpha"));
+						if (wcross_alpha == 0)
+							return;
+
 						wcross_style = cvar_string(strcat("crosshair_", wcross_wep));
 						if(wcross_style == "")
 							wcross_style = e.netname;
@@ -751,9 +765,6 @@ void CSQC_UpdateView(float w, float h)
 							wcross_color_y = cvar(strcat("crosshair_", wcross_wep, "_color_green"));
 							wcross_color_z = cvar(strcat("crosshair_", wcross_wep, "_color_blue"));
 						}
-
-						wcross_alpha *= cvar(strcat("crosshair_", wcross_wep, "_color_alpha"));
-						wcross_resolution *= cvar(strcat("crosshair_", wcross_wep, "_size"));
 					}
 				}
 
@@ -771,7 +782,7 @@ void CSQC_UpdateView(float w, float h)
 
 				if(shottype == SHOTTYPE_HITENEMY)
 					wcross_scale *= cvar("crosshair_hittest"); // is not queried if hittest is 0
-				if(shottype == SHOTTYPE_HITTEAM)
+				else if(shottype == SHOTTYPE_HITTEAM)
 					wcross_scale /= cvar("crosshair_hittest"); // is not queried if hittest is 0
 
 				f = cvar("crosshair_effect_speed");
@@ -825,7 +836,6 @@ void CSQC_UpdateView(float w, float h)
 
 				ring_scale = cvar("crosshair_ring_size");
 
-				float f, a;
 				wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
 
 				float nex_charge;
@@ -950,11 +960,6 @@ void CSQC_UpdateView(float w, float h)
 	// let's reset the view back to normal for the end
 	R_SetView(VF_MIN, '0 0 0');
 	R_SetView(VF_SIZE, '1 0 0' * w + '0 1 0' * h);
-
-	// be safe against triggerbots until everyone has the fixed engine
-	// this call is meant to overwrite the trace globals by something
-	// unsuspicious
-	traceline('0 0 0', '0 0 0', MOVE_WORLDONLY, world);
 }
 
 #define spider_h "gfx/vehicles/hud_bg.tga"
@@ -1265,7 +1270,9 @@ void CSQC_common_hud(void)
 			if(cvar_string("hud_panel_weapons_accuracy_color_levels") != acc_color_levels)
 			if(!(gametype == GAME_RACE || gametype == GAME_CTS))
 			{
-				acc_color_levels = cvar_string("hud_panel_weapons_accuracy_color_levels");
+				if(acc_color_levels)
+					strunzone(acc_color_levels);
+				acc_color_levels = strzone(cvar_string("hud_panel_weapons_accuracy_color_levels"));
 				acc_levels = tokenize(acc_color_levels);
 				if (acc_levels > MAX_ACCURACY_LEVELS)
 					acc_levels = MAX_ACCURACY_LEVELS;