Fix the hooks for weapon and sound models, supposedly

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 5ee9aaa3bd052c6b60c125ccd62a4495df5f0563..7d5ef31eecef27277ed8c73d1b92456c0e6a2bb0 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -336,8 +336,10 @@ string W_Sound(string w_snd)
        string output = strcat("weapons/", w_snd, ".wav");
 #ifdef SVQC
        MUTATOR_CALLHOOK(WeaponSound, w_snd, output);
-#endif
+       return weapon_sound_output;
+#else
        return output;
+#endif
 }
 
 string W_Model(string w_mdl)
@@ -345,8 +347,10 @@ string W_Model(string w_mdl)
        string output = strcat("models/weapons/", w_mdl);
 #ifdef SVQC
        MUTATOR_CALLHOOK(WeaponModel, w_mdl, output);
-#endif
+       return weapon_model_output;
+#else
        return output;
+#endif
 }
 
 #endif

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 0985e4bfe46e2c07dccc62c10115d4217f796878..3c944619bfa693a259e86fe808de93a15ec342ae 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -1189,7 +1189,7 @@ string Item_Model(string item_mdl)
 {
        string output = strcat("models/items/", item_mdl);
        MUTATOR_CALLHOOK(ItemModel, item_mdl, output);
-       return strzone(output);
+       return strzone(item_model_output);
 }
 
 void StartItemA (entity a)