Merge branch 'master' into Mario/tweaks

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

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 579e6fdff74ea6793a760cebb27b43ced7940e72..748f434eb325dd3cf002279d599cd8ed2dade4ef 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -36,7 +36,7 @@ void weapon_defaultspawnfunc(entity this, Weapon e)
 
                string s = W_Apply_Weaponreplace(e.netname);
                MUTATOR_CALLHOOK(SetWeaponreplace, this, e, s);
-               s = ret_string;
+               s = M_ARGV(2, string);
                if (s == "")
                {
                        remove(this);