From: terencehill Date: Mon, 7 Nov 2016 10:39:58 +0000 (+0100) Subject: Simplify conditions X-Git-Tag: xonotic-v0.8.2~461 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5a09904e3b84754a2dbb69c03952fdd2bb3803f;p=xonotic%2Fxonotic-data.pk3dir.git Simplify conditions --- diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 6283ed6d2..994ff12aa 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -1121,11 +1121,11 @@ 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) + if (weapon_stats < 0 && !((weapons_stat & set) || (weapons_inmap & set))) { - 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))) + if (((it.spawnflags & WEP_FLAG_HIDDEN) || (it.spawnflags & WEP_FLAG_MUTATORBLOCKED))) + ++nHidden; + else ++disownedcnt; } });