From: Mario <mario@smbclan.net>
Date: Mon, 11 Jun 2018 04:33:30 +0000 (+1000)
Subject: Fix compilation unit
X-Git-Tag: xonotic-v0.8.5~2076
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6850e61912fd5e4069d147f743f62d11b8df6db1;p=xonotic%2Fxonotic-data.pk3dir.git

Fix compilation unit
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 98e38f4d5..48bc63bbc 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -92,7 +92,6 @@ const float SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS = 1;
 string redirection_target;
 float world_initialized;
 
-string GetGametype();
 void ShuffleMaplist();
 
 void SetDefaultAlpha()
diff --git a/qcsrc/server/g_world.qh b/qcsrc/server/g_world.qh
index 034407bc1..35ea5fe7d 100644
--- a/qcsrc/server/g_world.qh
+++ b/qcsrc/server/g_world.qh
@@ -16,6 +16,8 @@ void IntermissionThink(entity this);
 void GotoNextMap(float reinit);
 void ReadyRestart();
 
+string GetGametype();
+
 void DumpStats(float final);
 float Map_IsRecent(string m);
 string GetNextMap();
diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index 16c5a1d4d..df69ade28 100644
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <server/defs.qh>
+#include <server/g_world.qh>
 
 #include <common/t_items.qh>
 
@@ -215,7 +216,6 @@ void readplayerstartcvars();
 float sv_autotaunt;
 float sv_taunt;
 
-string GetGametype(); // g_world.qc
 void readlevelcvars()
 {
 	if(cvar("sv_allow_fullbright"))
diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 67c115c8a..166c64255 100644
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -1,11 +1,19 @@
 #include "scores.qh"
 
 #include "command/common.qh"
-#include "mutators/_mod.qh"
+#include "defs.qh"
+#include <server/g_world.qh>
+#include <server/miscfunctions.qh>
+//#include "mutators/_mod.qh"
+#include "mutators/events.qh"
 #include <common/net_linked.qh>
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"
+#include <common/mapinfo.qh>
+#include <common/mutators/base.qh>
 #include <common/scores.qh>
+#include <common/state.qh>
+#include <common/stats.qh>
 
 .entity scorekeeper;
 entity teamscorekeepers[16];
diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 3a6d36d31..6cfd45b10 100644
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,8 +1,9 @@
 #include "spawnpoints.qh"
 
-#include "mutators/_mod.qh"
+#include "mutators/events.qh"
 #include "g_world.qh"
 #include "race.qh"
+#include "defs.qh"
 #include "../common/constants.qh"
 #include <common/net_linked.qh>
 #include "../common/teams.qh"
@@ -11,6 +12,7 @@
 #include "../common/util.qh"
 #include "../lib/warpzone/common.qh"
 #include "../lib/warpzone/util_server.qh"
+#include <server/utils.qh>
 
 bool SpawnPoint_Send(entity this, entity to, int sf)
 {
diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 22ffa254a..6d412bace 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -2,6 +2,7 @@
 
 #include "anticheat.qh"
 #include "g_hook.qh"
+#include "g_damage.qh"
 #include "g_world.qh"
 
 #include "bot/api.qh"
@@ -18,6 +19,7 @@
 #include "../common/util.qh"
 
 #include "../common/vehicles/all.qh"
+#include <common/monsters/sv_monsters.qh>
 #include <common/weapons/_all.qh>
 
 #include "../lib/csqcmodel/sv_model.qh"