]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix compilation unit
authorMario <mario@smbclan.net>
Mon, 11 Jun 2018 04:33:30 +0000 (14:33 +1000)
committerMario <mario@smbclan.net>
Mon, 11 Jun 2018 04:33:30 +0000 (14:33 +1000)
qcsrc/server/g_world.qc
qcsrc/server/g_world.qh
qcsrc/server/miscfunctions.qh
qcsrc/server/scores.qc
qcsrc/server/spawnpoints.qc
qcsrc/server/sv_main.qc

index 98e38f4d5e70995e8d389448187770fe5148e8e5..48bc63bbc07e2b0beaaecadd57199b48b0a32d52 100644 (file)
@@ -92,7 +92,6 @@ const float SPAWNFLAG_NO_WAYPOINTS_FOR_ITEMS = 1;
 string redirection_target;
 float world_initialized;
 
-string GetGametype();
 void ShuffleMaplist();
 
 void SetDefaultAlpha()
index 034407bc1f0f135722602b3ba8224e70ca98ea00..35ea5fe7da17cb73a4af79baddc1a4580d73b196 100644 (file)
@@ -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();
index 16c5a1d4d48dd1f738d4c20621dc61310ad90d23..df69ade2861fcbcc4f6372be2e72ec12f85b6d27 100644 (file)
@@ -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"))
index 67c115c8a56ff7dfc2135e973c693f6476762efa..166c642559437d108e8a42cd50f7b225ef50ee1d 100644 (file)
@@ -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];
index 3a6d36d31695afaa7102e557d5639960f61e031c..6cfd45b101ec9f998db67b0a0232306ddc362a7d 100644 (file)
@@ -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)
 {
index 22ffa254a927bc57089127016022c8536de4473b..6d412bacea5981e2d40a6a68a4f91ba510307648 100644 (file)
@@ -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"