Commit 936e0798 authored by Mario's avatar Mario

Remove IT_AMMO

parent c80ad7d4
Pipeline #5552776 passed with stages
in 20 minutes and 8 seconds
......@@ -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
......
......@@ -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;
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment