Merge branch 'master' into Mario/q3compat_sanity

[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 1e23f3287940218b3c8a882033d3f12b42c88fd2..dfcacdc609b2da10aa47b4b1756be4d4dea6091e 100644 (file)
--- a/qcsrc/common/monsters/all.qh
+++ b/qcsrc/common/monsters/all.qh
@@ -1,22 +1,14 @@
-#ifndef MONSTERS_ALL_H
-#define MONSTERS_ALL_H
-
-#include "monster.qh"
+#pragma once
 
 string M_Model(string m_mdl);
 
 REGISTRY(Monsters, BITS(5))
-#define Monsters_from(i) _Monsters_from(i, MON_Null)
-#define get_monsterinfo(i) Monsters_from(i)
+#define get_monsterinfo(i) REGISTRY_GET(Monsters, i)
 REGISTER_REGISTRY(Monsters)
 REGISTRY_CHECK(Monsters)
-const int MON_FIRST = 1;
-#define MON_LAST (Monsters_COUNT - 1)
 #define REGISTER_MONSTER(id, inst) REGISTER(Monsters, MON, id, monsterid, inst)
 
-REGISTER_MONSTER(Null, NEW(Monster));
-
-
-#include "monster/_mod.inc"
+#include "monster.qh"
 
-#endif
+REGISTER_MONSTER(Null, NEW(Monster));
+REGISTRY_DEFINE_GET(Monsters, MON_Null)