Merge branch 'TimePath/entitydebugger' into 'master'

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

diff --git a/qcsrc/common/items/all.qh b/qcsrc/common/items/all.qh
index 3f8c603e7ab2aabeb75c74f438a00e73bba7593b..ca0189292ffa4b2dd4288b541541f988774c2ac0 100644 (file)
--- a/qcsrc/common/items/all.qh
+++ b/qcsrc/common/items/all.qh
@@ -1,20 +1,37 @@
 #ifndef ITEMS_ALL_H
 #define ITEMS_ALL_H
 
-void RegisterItems();
-const int MAX_ITEMS = 24;
-entity ITEMS[MAX_ITEMS], ITEMS_first, ITEMS_last;
-int ITEM_COUNT;
-/** If you register a new item, make sure to add it to all.inc */
-#define REGISTER_ITEM(id, class) REGISTER(RegisterItems, ITEM, ITEMS, ITEM_COUNT, id, m_id, NEW(class))
+#include "../command/all.qh"
+
+#include "item.qh"
+
+REGISTRY(Items, BITS(5))
+#define Items_from(i) _Items_from(i, NULL)
 REGISTER_REGISTRY(RegisterItems)
+/** If you register a new item, make sure to add it to all.inc */
+#define REGISTER_ITEM(id, class) REGISTER(RegisterItems, ITEM, Items, id, m_id, NEW(class))
+
+REGISTRY_SORT(Items, m_name, 0)
+STATIC_INIT(Items) { FOREACH(Items, true, LAMBDA(it.m_id = i)); }
 
 void Dump_Items();
 
+GENERIC_COMMAND(dumpitems, "Dump all items to the console") {
+    switch (request) {
+        case CMD_REQUEST_COMMAND: {
+            Dump_Items();
+            return;
+        }
+        default:
+        case CMD_REQUEST_USAGE: {
+            LOG_INFOF("\nUsage:^3 %s dumpitems", GetProgramCommandPrefix());
+            return;
+        }
+    }
+}
+
 #ifndef MENUQC
 string Item_Model(string item_mdl);
 #endif
 
 #endif
-
-#include "inventory.qh"