Unify boolean constants

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / throwing.qc

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index e5f36b941356f8f6c449da24d45a46aea2e4789b..411ab92bede55ee3725f571e17df0889bd1618ec 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -32,6 +32,8 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
        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)
        {
@@ -71,7 +73,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
        wep.think = thrown_wep_think;
        wep.savenextthink = wep.nextthink;
        wep.nextthink = min(wep.nextthink, time + 0.5);
-       wep.pickup_anyway = TRUE; // these are ALWAYS pickable
+       wep.pickup_anyway = true; // these are ALWAYS pickable
        
        //wa = W_AmmoItemCode(wpn);
        if(ammotype == ammo_none)
@@ -112,6 +114,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                                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;
                        }
 
@@ -182,5 +185,5 @@ 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');
+                       W_ThrowNewWeapon(self, self.weapon, false, org, randomvec() * 125 + '0 0 200');
 }