r5602 - trunk/data/qcsrc/client

[esteel at icculus.org]

Author: esteel
Date: 2009-01-18 10:23:24 -0500 (Sun, 18 Jan 2009)
New Revision: 5602

Modified:
   trunk/data/qcsrc/client/View.qc
Log:
crosshair 0 = DISABLE crosshair :-P

Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-01-18 14:28:46 UTC (rev 5601)
+++ trunk/data/qcsrc/client/View.qc	2009-01-18 15:23:24 UTC (rev 5602)
@@ -452,48 +452,48 @@
 
 	// crosshair
 	if(!scoreboard_active && !ons_showmap) {
-		string wcross_wep;
-		float wcross_alpha;
 		string wcross_style;
-		vector wcross_color, wcross_size;
-		float wcross_sizefloat;
-		string wcross_name;
-
 		wcross_style = cvar_string("crosshair");
-		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_sizefloat = cvar("crosshair_size");
 
-		if (cvar("crosshair_per_weapon")) {
-			e = get_weaponinfo(activeweapon);
-			if (e && e.netname != "")
-			{
-				wcross_wep = e.netname;
-				wcross_style = cvar_string(strcat("crosshair_", wcross_wep));
-				if(wcross_style == "")
-					wcross_style = e.netname;
+		if (wcross_style != "0") {
+			vector wcross_color, wcross_size;
+			string wcross_wep, wcross_name;
+			float wcross_alpha, wcross_sizefloat;
 
-				if(!cvar("crosshair_color_override"))
+			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_sizefloat = cvar("crosshair_size");
+			if (cvar("crosshair_per_weapon")) {
+				e = get_weaponinfo(activeweapon);
+				if (e && e.netname != "")
 				{
-					wcross_color_x = cvar(strcat("crosshair_", wcross_wep, "_color_red"));
-					wcross_color_y = cvar(strcat("crosshair_", wcross_wep, "_color_green"));
-					wcross_color_z = cvar(strcat("crosshair_", wcross_wep, "_color_blue"));
+					wcross_wep = e.netname;
+					wcross_style = cvar_string(strcat("crosshair_", wcross_wep));
+					if(wcross_style == "")
+						wcross_style = e.netname;
+
+					if(!cvar("crosshair_color_override"))
+					{
+						wcross_color_x = cvar(strcat("crosshair_", wcross_wep, "_color_red"));
+						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_sizefloat *= cvar(strcat("crosshair_", wcross_wep, "_size"));
 				}
-
-				wcross_alpha *= cvar(strcat("crosshair_", wcross_wep, "_color_alpha"));
-				wcross_sizefloat *= cvar(strcat("crosshair_", wcross_wep, "_size"));
 			}
-		}
 
-		wcross_name = strcat("gfx/crosshair", wcross_style);
+			wcross_name = strcat("gfx/crosshair", wcross_style);
 		
-		wcross_size = drawgetimagesize(wcross_name);
-		wcross_size_x *= wcross_sizefloat;
-		wcross_size_y *= wcross_sizefloat;
+			wcross_size = drawgetimagesize(wcross_name);
+			wcross_size_x *= wcross_sizefloat;
+			wcross_size_y *= wcross_sizefloat;
 
-		drawpic('0.5 0 0' * (vid_conwidth - wcross_size_x) + '0 0.5 0' * (vid_conheight - wcross_size_y), wcross_name, wcross_size, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
+			drawpic('0.5 0 0' * (vid_conwidth - wcross_size_x) + '0 0.5 0' * (vid_conheight - wcross_size_y), wcross_name, wcross_size, wcross_color, wcross_alpha, DRAWFLAG_NORMAL);
+		}
 	}
 
 	// Draw the mouse cursor