Monsters: fix compilation units

diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh
index 89b5591b4d5ff9ce3daf20aeb847a04d21726fb0..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,4 +11,6 @@ const int MON_FIRST = 1;
 #define MON_LAST (Monsters_COUNT - 1)
 #define REGISTER_MONSTER(id, inst) REGISTER(Monsters, MON, id, monsterid, inst)
 
+#include "monster.qh"
+
 REGISTER_MONSTER(Null, NEW(Monster));

diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh
index 341b92e7b53849b86b5a3b830c7d4173ec7062c5..babf6e4faf19a2f1e1879afd774693a05514c762 100644 (file)
--- a/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@ -1,22 +1,5 @@
 #pragma once
 
-#ifdef SVQC
-#include "sv_monsters.qh"
-#include <server/g_damage.qh>
-#include <server/bot/api.qh>
-#include <server/weapons/common.qh>
-#include <server/weapons/tracing.qh>
-#include <server/weapons/weaponsystem.qh>
-#include <common/mutators/mutator/waypoints/waypointsprites.qh>
-#include <lib/warpzone/server.qh>
-#endif
-
-#ifdef GAMEQC
-#include "../animdecide.qh"
-#include "../anim.qh"
-vector animfixfps(entity e, vector a, vector b);
-#endif
-
 // special spawn flags
 const int MONSTER_RESPAWN_DEATHPOINT = 16; // re-spawn where we died
 const int MONSTER_TYPE_FLY = 32;
@@ -73,3 +56,21 @@ CLASS(Monster, Object)
     METHOD(Monster, mr_anim, bool(Monster this, entity actor)) { TC(Monster, this); return false; }
 
 ENDCLASS(Monster)
+
+
+#ifdef SVQC
+#include "sv_monsters.qh"
+#include <server/g_damage.qh>
+#include <server/bot/api.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/tracing.qh>
+#include <server/weapons/weaponsystem.qh>
+#include <common/mutators/mutator/waypoints/waypointsprites.qh>
+#include <lib/warpzone/server.qh>
+#endif
+
+#ifdef GAMEQC
+#include "../animdecide.qh"
+#include "../anim.qh"
+vector animfixfps(entity e, vector a, vector b);
+#endif

diff --git a/qcsrc/common/monsters/monster/mage.qh b/qcsrc/common/monsters/monster/mage.qh
index 04826b39b543da893bb376ab0eefdbb7e9a87400..d78ee5ecf6b7f4bc8f8577a5d68ca93898da3550 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qh
+++ b/qcsrc/common/monsters/monster/mage.qh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "../all.qh"
+
 #ifdef GAMEQC
 MODEL(MON_MAGE, M_Model("mage.dpm"));
 #endif

diff --git a/qcsrc/common/monsters/monster/shambler.qh b/qcsrc/common/monsters/monster/shambler.qh
index 0824b55879aaec0745f98f3524df919c77843a3b..f7a3ce3a94f7ad7ee847c2f6ba269bc2e683d9c6 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qh
+++ b/qcsrc/common/monsters/monster/shambler.qh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "../all.qh"
+
 #ifdef GAMEQC
 MODEL(MON_SHAMBLER, M_Model("shambler.mdl"));
 #endif

diff --git a/qcsrc/common/monsters/monster/spider.qh b/qcsrc/common/monsters/monster/spider.qh
index 1da750d4ce74a3dc3eb1bcaefb581eb17fa59e1f..c54eb3a7a8c7a3e9c7cef14d562f8bcfa22eda70 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qh
+++ b/qcsrc/common/monsters/monster/spider.qh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "../all.qh"
+
 #ifdef GAMEQC
 MODEL(MON_SPIDER, M_Model("spider.dpm"));
 #endif

diff --git a/qcsrc/common/monsters/monster/wyvern.qh b/qcsrc/common/monsters/monster/wyvern.qh
index 0982eb176b4090f876d9c644fed2a03dc24369c8..0af84c1301e26e042930bd26519e6fec3dfb93e1 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qh
+++ b/qcsrc/common/monsters/monster/wyvern.qh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "../all.qh"
+
 #ifdef GAMEQC
 MODEL(MON_WYVERN, M_Model("wizard.mdl"));
 #endif

diff --git a/qcsrc/common/monsters/monster/zombie.qh b/qcsrc/common/monsters/monster/zombie.qh
index c5e243c754a86cbd0189223df03957555268ee83..b52056e71d9d0b58fd394f4bac976dd5f45c4fec 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qh
+++ b/qcsrc/common/monsters/monster/zombie.qh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "../all.qh"
+
 #ifdef GAMEQC
 MODEL(MON_ZOMBIE, M_Model("zombie.dpm"));
 #endif