Cleanse more of the mutator hooks

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

diff --git a/qcsrc/common/items/all.qc b/qcsrc/common/items/all.qc
index 8a9e314020bd16f100774837050c14d3ed3019a5..7a3e5004696ee1c655a8f5eca7e3cb5cb3506b54 100644 (file)
--- a/qcsrc/common/items/all.qc
+++ b/qcsrc/common/items/all.qc
@@ -2,13 +2,11 @@
 #define ITEMS_ALL_C
 #include "all.qh"
 
-#include "all.inc"
+#include "item/_mod.inc"
 
 void Dump_Items()
 {
-    FOREACH(ITEMS, true, LAMBDA(
-        ITEM_HANDLE(Show, it);
-    ));
+    FOREACH(Items, true, ITEM_HANDLE(Show, it));
 }
 
 string Item_Model(string item_mdl)
@@ -16,7 +14,7 @@ string Item_Model(string item_mdl)
     string output = strcat("models/items/", item_mdl);
 #ifdef SVQC
     MUTATOR_CALLHOOK(ItemModel, item_mdl, output);
-    output = item_model_output;
+    output = M_ARGV(1, string);
 #endif
     return output;
 }