Merge branch 'master' into TimePath/modules

[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 62dc0fe270be2d48efaf5ab54b3547aa41ed9665..7782cda0d6d1518c47de858484a6123974dcde45 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 "all.inc"
-
 void Dump_Items()
 {
     FOREACH(Items, true, ITEM_HANDLE(Show, it));
@@ -14,9 +10,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;
 }
-
-#endif