Merge branch 'master' into terencehill/hud_fixes

[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 fa198bb8328b709f090c035663e896fd62b4f0c1..9d7cfa8d32e428aed292e73b8a4d501cbfada5f9 100644 (file)
--- a/qcsrc/common/items/all.qc
+++ b/qcsrc/common/items/all.qc
@@ -1,14 +1,22 @@
-#ifndef ALL_C
-#define ALL_C
+#ifndef ITEMS_ALL_C
+#define ITEMS_ALL_C
 #include "all.qh"
 
-#include "all.inc"
+#include "item/_mod.inc"
 
 void Dump_Items()
 {
-    ITEMS_FOREACH(true, LAMBDA({
-        ITEM_HANDLE(Show, it);
-    }));
+    FOREACH(Items, true, ITEM_HANDLE(Show, it));
+}
+
+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;
+#endif
+    return output;
 }
 
 #endif