-#ifndef MONSTERS_ALL_H
-#define MONSTERS_ALL_H
+#pragma once
-#include "monster.qh"
-
-REGISTRY(Monsters, BIT(4))
-REGISTER_REGISTRY(RegisterMonsters)
-const int MON_FIRST = 1;
-#define MON_LAST (Monsters_COUNT - 1)
-/** If you register a new monster, make sure to add it to all.inc */
-#define REGISTER_MONSTER(id, inst) REGISTER(RegisterMonsters, MON, Monsters, id, monsterid, inst)
-
-REGISTER_MONSTER(Null, NEW(Monster));
+string M_Model(string m_mdl);
-Monster get_monsterinfo(int id)
-{
- if (id >= MON_FIRST && id <= MON_LAST) {
- Monster m = Monsters[id];
- if (m) return m;
- }
- return MON_Null;
-}
+REGISTRY(Monsters, BITS(5))
+#define get_monsterinfo(i) REGISTRY_GET(Monsters, i)
+REGISTER_REGISTRY(Monsters)
+REGISTRY_CHECK(Monsters)
+#define REGISTER_MONSTER(id, inst) REGISTER(Monsters, MON, id, monsterid, inst)
-#include "all.inc"
+#include "monster.qh"
-#endif
+REGISTER_MONSTER(Null, NEW(Monster));
+REGISTRY_DEFINE_GET(Monsters, MON_Null)