From: Mario <zacjardine@y7mail.com>
Date: Mon, 24 Aug 2015 07:41:31 +0000 (+1000)
Subject: Fix the hooks for weapon and sound models, supposedly
X-Git-Tag: xonotic-v0.8.2~2039
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=8f702ae20a0ba5fee40233c1fc8d3c03a60f982d;p=xonotic%2Fxonotic-data.pk3dir.git

Fix the hooks for weapon and sound models, supposedly
---

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 5ee9aaa3b..7d5ef31ee 100644
--- 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 0985e4bfe..3c944619b 100644
--- 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)