Merge branch 'master' into Mario/stats_eloranking

[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 84f7a0d78f6d19d4121334681655c170e19f2569..c9e5ad37ba6448ed85374378affde2e871a6197c 100644 (file)
--- a/qcsrc/common/monsters/all.qh
+++ b/qcsrc/common/monsters/all.qh
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "monster.qh"
-
 string M_Model(string m_mdl);
 
 REGISTRY(Monsters, BITS(5))
@@ -13,7 +11,6 @@ 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.qh"
 
-#include "monster/_mod.inc"
+REGISTER_MONSTER(Null, NEW(Monster));