entity oldself, wep;
float thisammo, i;
string s;
- var .float ammofield = (get_weaponinfo(wpn)).current_ammo;
+ var .float ammotype = (get_weaponinfo(wpn)).ammo_field;
wep = spawn();
wep.owner = wep.enemy = own;
wep.flags |= FL_TOSSED;
wep.colormap = own.colormap;
+
+ W_DropEvent(WR_DROP,own,wpn,wep);
if(WepSet_FromWeapon(wpn) & WEPSET_SUPERWEAPONS)
{
wep.pickup_anyway = TRUE; // these are ALWAYS pickable
//wa = W_AmmoItemCode(wpn);
- if(ammofield == ammo_none)
+ if(ammotype == ammo_none)
{
return "";
}
// if our weapon is loaded, give its load back to the player
if(self.(weapon_load[self.weapon]) > 0)
{
- own.ammofield += self.(weapon_load[self.weapon]);
+ own.ammotype += self.(weapon_load[self.weapon]);
self.(weapon_load[self.weapon]) = -1; // schedule the weapon for reloading
}
- wep.ammofield = 0;
+ wep.ammotype = 0;
}
else if(doreduce)
{
// if our weapon is loaded, give its load back to the player
if(self.(weapon_load[self.weapon]) > 0)
{
- own.ammofield += self.(weapon_load[self.weapon]);
+ own.ammotype += self.(weapon_load[self.weapon]);
self.(weapon_load[self.weapon]) = -1; // schedule the weapon for reloading
}
- thisammo = min(own.ammofield, wep.ammofield);
- wep.ammofield = thisammo;
- own.ammofield -= thisammo;
+ thisammo = min(own.ammotype, wep.ammotype);
+ wep.ammotype = thisammo;
+ own.ammotype -= thisammo;
- switch(ammofield)
+ switch(ammotype)
{
case ammo_shells: s = sprintf("%s and %d shells", s, thisammo); break;
case ammo_nails: s = sprintf("%s and %d nails", s, thisammo); break;
case ammo_rockets: s = sprintf("%s and %d rockets", s, thisammo); break;
case ammo_cells: s = sprintf("%s and %d cells", s, thisammo); break;
+ case ammo_plasma: s = sprintf("%s and %d plasma", s, thisammo); break;
case ammo_fuel: s = sprintf("%s and %d fuel", s, thisammo); break;
}
return 0;
if(w == 0)
return 0;
-
+
+ #if 0
if(start_weapons & WepSet_FromWeapon(w))
{
// start weapons that take no ammo can't be dropped (this prevents dropping the laser, as long as it continues to use no ammo)
if(start_items & IT_UNLIMITED_WEAPON_AMMO)
return 0;
- if((get_weaponinfo(w)).current_ammo == ammo_none)
+ if((get_weaponinfo(w)).ammo_field == ammo_none)
return 0;
}
-
return 1;
+ #else
+ return (get_weaponinfo(w)).weaponthrowable;
+ #endif
}
// toss current weapon
if(!a) return;
Send_Notification(NOTIF_ONE, self, MSG_MULTI, ITEM_WEAPON_DROP, a, w);
}
+
+void SpawnThrownWeapon(vector org, float w)
+{
+ if(self.weapons & WepSet_FromWeapon(self.weapon))
+ if(W_IsWeaponThrowable(self.weapon))
+ W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
+}