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 7a3e5004696ee1c655a8f5eca7e3cb5cb3506b54..0a26a75b5a7fd33aeee0f0b35a3dfd4b8ec92b8b 100644 (file)
--- a/qcsrc/common/items/all.qc
+++ b/qcsrc/common/items/all.qc
@@ -1,9 +1,5 @@
-#ifndef ITEMS_ALL_C
-#define ITEMS_ALL_C
 #include "all.qh"
 
-#include "item/_mod.inc"
-
 void Dump_Items()
 {
     FOREACH(Items, true, ITEM_HANDLE(Show, it));
@@ -19,4 +15,13 @@ string Item_Model(string item_mdl)
     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
+}