From: Mario <mario@smbclan.net>
Date: Thu, 28 Jul 2016 13:37:00 +0000 (+1000)
Subject: Fix black crosshair when in vehicle with per weapon crosshair colour enabled
X-Git-Tag: xonotic-v0.8.2~700^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ce295e758d2eb7cb6f52cf197447fd82933cbc8;p=xonotic%2Fxonotic-data.pk3dir.git

Fix black crosshair when in vehicle with per weapon crosshair colour enabled
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index cbce1fcb5..1458efe15 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -861,7 +861,7 @@ vector crosshair_getcolor(entity this, float health_stat)
 	{
 		case 1: // crosshair_color_per_weapon
 		{
-			if(this != WEP_Null)
+			if(this != WEP_Null && hud == HUD_NORMAL)
 			{
 				wcross_color = this.wpcolor;
 				break;