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 b771984f212b1b4ef3a680099e19e7059600662e..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);
 
@@ -12,12 +9,8 @@ REGISTER_REGISTRY(Monsters)
 REGISTRY_CHECK(Monsters)
 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(Monsters, MON, id, monsterid, inst)
 
-REGISTER_MONSTER(Null, NEW(Monster));
-
-
-#include "all.inc"
+#include "monster.qh"
 
-#endif
+REGISTER_MONSTER(Null, NEW(Monster));