]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Don't count weapons available in the map as hidden
authorMario <mario@smbclan.net>
Mon, 7 Nov 2016 05:16:18 +0000 (15:16 +1000)
committerMario <mario@smbclan.net>
Mon, 7 Nov 2016 05:16:18 +0000 (15:16 +1000)
qcsrc/client/hud/panel/scoreboard.qc

index ef68e21b2000808fb0a8cec871bb86abda43ea39..6283ed6d2de94cea95de399598622eb5c19e6618 100644 (file)
@@ -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;