From: Mario Date: Sat, 17 Feb 2018 11:26:50 +0000 (+1000) Subject: Fix numbering of weapon flag bits X-Git-Tag: xonotic-v0.8.5~2301 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5b64078700e8dfa9377726f100ea9739486173a2;p=xonotic%2Fxonotic-data.pk3dir.git Fix numbering of weapon flag bits --- diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh index 87cb11429..460d95af6 100644 --- a/qcsrc/common/weapons/weapon.qh +++ b/qcsrc/common/weapons/weapon.qh @@ -195,10 +195,10 @@ const int WEP_FLAG_RELOADABLE = BIT(6); // can has reload const int WEP_FLAG_SUPERWEAPON = BIT(7); // powerup timer const int WEP_FLAG_MUTATORBLOCKED = BIT(8); // hides from impulse 99 etc. (mutators are allowed to clear this flag) const int WEP_TYPE_MELEE_PRI = BIT(9); // primary attack is melee swing (for animation) -const int WEP_TYPE_MELEE_SEC = BIT(12); // secondary attack is melee swing (for animation) -const int WEP_FLAG_DUALWIELD = BIT(13); // weapon can be dual wielded -const int WEP_FLAG_NODUAL = BIT(14); // weapon doesn't work well with dual wielding (fireball etc just explode on fire), doesn't currently prevent anything -const int WEP_FLAG_PENETRATEWALLS = BIT(15); // weapon has high calibur bullets that can penetrate thick walls (WEAPONTODO) +const int WEP_TYPE_MELEE_SEC = BIT(10); // secondary attack is melee swing (for animation) +const int WEP_FLAG_DUALWIELD = BIT(11); // weapon can be dual wielded +const int WEP_FLAG_NODUAL = BIT(12); // weapon doesn't work well with dual wielding (fireball etc just explode on fire), doesn't currently prevent anything +const int WEP_FLAG_PENETRATEWALLS = BIT(13); // weapon has high calibur bullets that can penetrate thick walls (WEAPONTODO) // variables: string weaponorder_byid;