From: Mario Date: Tue, 27 Dec 2016 08:20:35 +0000 (+1000) Subject: Remove IT_AMMO X-Git-Tag: xonotic-v0.8.2~349 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=936e07981f6ca4beacadd708ca991895f4f74596;p=xonotic%2Fxonotic-data.pk3dir.git Remove IT_AMMO --- diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh index bac127059..f3aa0cec2 100644 --- a/qcsrc/common/items/item.qh +++ b/qcsrc/common/items/item.qh @@ -34,7 +34,6 @@ const int IT_SUPERWEAPON = BIT(21); // suit const int IT_STRENGTH = BIT(22); // item masks -const int IT_AMMO = IT_FUEL | IT_SHELLS | IT_NAILS | IT_ROCKETS | IT_CELLS | IT_PLASMA; const int IT_UNLIMITED_AMMO = IT_UNLIMITED_WEAPON_AMMO | IT_UNLIMITED_SUPERWEAPONS; const int IT_PICKUPMASK = IT_UNLIMITED_AMMO | IT_JETPACK | IT_FUEL_REGEN; // strength and invincible are handled separately diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index 19aa6ba54..cacbfdcea 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -393,7 +393,7 @@ bool have_pickup_item(entity this) if(autocvar_g_pickup_items == 0) return false; if(g_weaponarena) - if(this.weapons || (this.items & IT_AMMO)) // no item or ammo pickups in weaponarena + if(this.weapons || this.itemdef.instanceOfAmmo) // no item or ammo pickups in weaponarena return false; } return true; diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index 7dbdae683..ad479824e 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -447,7 +447,6 @@ void W_WeaponFrame(Player actor, .entity weaponentity) PS(actor).m_switchingweapon = WEP_Null; this.state = WS_CLEAR; actor.weaponname = ""; - // actor.items &= ~IT_AMMO; return; }