Merge branch 'master' into TimePath/global_self

[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 5c3b11dd3bfb27396cb6141664e78799b79b7b3a..2fb19609eaf71685cc33a15d7d9ca700fb870cc2 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -31,12 +31,11 @@ void thrown_wep_think()
 // returns amount of ammo used as string, or -1 for failure, or 0 for no ammo count
 string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector velo)
 {SELFPARAM();
-       entity oldself, wep;
        float thisammo, i;
        string s;
        var .int ammotype = (get_weaponinfo(wpn)).ammo_field;
 
-       wep = spawn();
+       entity wep = spawn();
 
        setorigin(wep, org);
        wep.classname = "droppedweapon";
@@ -75,10 +74,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
                }
        }
 
-       oldself = self;
-       self = wep;
-       weapon_defaultspawnfunc(wpn);
-       self = oldself;
+       WITH(entity, self, wep, weapon_defaultspawnfunc(wpn));
        if(startitem_failed)
                return string_null;
        wep.glowmod = own.weaponentity_glowmod;