From 8f702ae20a0ba5fee40233c1fc8d3c03a60f982d Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 24 Aug 2015 17:41:31 +1000 Subject: [PATCH] Fix the hooks for weapon and sound models, supposedly --- qcsrc/common/weapons/all.qc | 8 ++++++-- qcsrc/server/t_items.qc | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) 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) -- 2.39.2