From: Mario <mario@smbclan.net>
Date: Mon, 7 Nov 2016 05:16:18 +0000 (+1000)
Subject: Don't count weapons available in the map as hidden
X-Git-Tag: xonotic-v0.8.2~462
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81fbb463dd1ac7b510b8088f337aa28c47ac3dd7;p=xonotic%2Fxonotic-data.pk3dir.git

Don't count weapons available in the map as hidden
---

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index ef68e21b2..6283ed6d2 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1123,9 +1123,9 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size)
 		WepSet set = it.m_wepset;
 		if (weapon_stats < 0)
 		{
-			if (!(weapons_stat & set) && (it.spawnflags & WEP_FLAG_HIDDEN || it.spawnflags & WEP_FLAG_MUTATORBLOCKED))
+			if (!(weapons_stat & set) && !(weapons_inmap & set) && ((it.spawnflags & WEP_FLAG_HIDDEN) || (it.spawnflags & WEP_FLAG_MUTATORBLOCKED)))
 				nHidden += 1;
-			else if (!(weapons_stat & set || weapons_inmap & set))
+			else if (!((weapons_stat & set) || (weapons_inmap & set)))
 				++disownedcnt;
 		}
 	});
@@ -1199,7 +1199,7 @@ vector Scoreboard_AccuracyStats_Draw(vector pos, vector rgb, vector bg_size)
 		int weapon_stats = weapon_accuracy[i - WEP_FIRST];
 
 		WepSet set = it.m_wepset;
-		if (weapon_stats < 0 && !(weapons_stat & set || weapons_inmap & set))
+		if (weapon_stats < 0 && !((weapons_stat & set) || (weapons_inmap & set)))
 			continue;
 
 		float weapon_alpha;