Merge branch 'master' into Mario/showspecs

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / all.qc

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 1e1ce3eede1b1b429aae7fbd53e9264eb8dce530..65168e13a331c2cebf305e667e7542328571b4ff 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -272,7 +272,7 @@ string W_Model(string w_mdl)
 {
        string output = strcat("models/weapons/", w_mdl);
        MUTATOR_CALLHOOK(WeaponModel, w_mdl, output);
-       return weapon_model_output;
+       return M_ARGV(1, string);
 }
 
 #ifndef MENUQC