From: terencehill <piuntn@gmail.com>
Date: Fri, 15 Oct 2010 20:01:11 +0000 (+0200)
Subject: Get the dock color only if the dock is active
X-Git-Tag: xonotic-v0.1.0preview~267^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=277c4c7ee176f32713b1a254a595350e2131a83c;p=xonotic%2Fxonotic-data.pk3dir.git

Get the dock color only if the dock is active
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index d93012de7..1a225de90 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4944,29 +4944,29 @@ void HUD_Main (void)
 		}
 	}
 
-	float f;
-	vector color;
-	if((teamplay) && autocvar_hud_dock_color_team) {
-		f = stof(getplayerkey(player_localentnum - 1, "colors"));
-		color = colormapPaletteColor(mod(f, 16), 1) * autocvar_hud_dock_color_team;
-	}
-	else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && autocvar_hud_dock_color_team) {
-		color = '1 0 0' * autocvar_hud_dock_color_team;
-	}
-	else if(autocvar_hud_dock_color == "shirt") {
-		f = stof(getplayerkey(player_localentnum - 1, "colors"));
-		color = colormapPaletteColor(floor(f / 16), 0);
-	}
-	else if(autocvar_hud_dock_color == "pants") {
-		f = stof(getplayerkey(player_localentnum - 1, "colors"));
-		color = colormapPaletteColor(mod(f, 16), 1);
-	}
-	else
-		color = stov(autocvar_hud_dock_color);
-
 	// draw the dock
 	if(autocvar_hud_dock != "" && autocvar_hud_dock != "0")
 	{
+		float f;
+		vector color;
+		if((teamplay) && autocvar_hud_dock_color_team) {
+			f = stof(getplayerkey(player_localentnum - 1, "colors"));
+			color = colormapPaletteColor(mod(f, 16), 1) * autocvar_hud_dock_color_team;
+		}
+		else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && autocvar_hud_dock_color_team) {
+			color = '1 0 0' * autocvar_hud_dock_color_team;
+		}
+		else if(autocvar_hud_dock_color == "shirt") {
+			f = stof(getplayerkey(player_localentnum - 1, "colors"));
+			color = colormapPaletteColor(floor(f / 16), 0);
+		}
+		else if(autocvar_hud_dock_color == "pants") {
+			f = stof(getplayerkey(player_localentnum - 1, "colors"));
+			color = colormapPaletteColor(mod(f, 16), 1);
+		}
+		else
+			color = stov(autocvar_hud_dock_color);
+
 		string pic;
 		pic = strcat(hud_skin_path, "/", autocvar_hud_dock);
 		if(precache_pic(pic) == "") {