Merge branch 'master' into martin-t/bullet-trails

[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..c9e5ad37ba6448ed85374378affde2e871a6197c 100644 (file)
--- a/qcsrc/common/monsters/all.qh
+++ b/qcsrc/common/monsters/all.qh
@@ -1,7 +1,4 @@
-#ifndef MONSTERS_ALL_H
-#define MONSTERS_ALL_H
-
-#include "monster.qh"
+#pragma once
 
 string M_Model(string m_mdl);
 
@@ -14,9 +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/_mod.inc"
+#include "monster.qh"
 
-#endif
+REGISTER_MONSTER(Null, NEW(Monster));