Merge branch 'master' into terencehill/keyhunt

[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..0a26a75b5a7fd33aeee0f0b35a3dfd4b8ec92b8b 100644 (file)
--- a/qcsrc/common/items/all.qc
+++ b/qcsrc/common/items/all.qc
@@ -1,14 +1,27 @@
-#ifndef ALL_C
-#define ALL_C
 #include "all.qh"
 
-#include "all.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 = M_ARGV(1, string);
 #endif
+    return output;
+}
+
+string Item_Sound(string it_snd)
+{
+       string output = strcat("misc/", it_snd);
+#ifdef SVQC
+               MUTATOR_CALLHOOK(ItemSound, it_snd, output);
+               return M_ARGV(1, string);
+#else
+               return output;
+#endif
+}