Merge branch 'terencehill/registry_API' into 'master'

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

diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh
index 0c4f0af991091fae5d3b63c35689d968619e1f7a..58840159ef60c60a386dbc5a817b3ad52ae93bc8 100644 (file)
--- a/qcsrc/common/monsters/all.qh
+++ b/qcsrc/common/monsters/all.qh
@@ -1,12 +1,16 @@
-#include "monster/brute.qc"
-#include "monster/animus.qc"
-#include "monster/shambler.qc"
-#include "monster/bruiser.qc"
-#include "monster/wyvern.qc"
-#include "monster/cerberus.qc"
-#include "monster/slime.qc"
-#include "monster/knight.qc"
-#include "monster/stingray.qc"
-#include "monster/mage.qc"
-#include "monster/zombie.qc"
-#include "monster/spider.qc"
+#pragma once
+
+string M_Model(string m_mdl);
+
+REGISTRY(Monsters, BITS(5))
+#define get_monsterinfo(i) REGISTRY_GET(Monsters, i)
+REGISTER_REGISTRY(Monsters)
+REGISTRY_CHECK(Monsters)
+const int MON_FIRST = 1;
+#define MON_LAST (REGISTRY_COUNT(Monsters) - 1)
+#define REGISTER_MONSTER(id, inst) REGISTER(Monsters, MON, id, monsterid, inst)
+
+#include "monster.qh"
+
+REGISTER_MONSTER(Null, NEW(Monster));
+REGISTRY_DEFINE_GET(Monsters, MON_Null)