Cleanup server mutator #includes

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 21d5ad73f9a519773a6aadad8375530e72b3be90..beca5ebbd5f383f6bae3a5f3ef9230b768dbdd8f 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -12,7 +12,7 @@
     #include <server/autocvars.qh>
     #include <server/defs.qh>
     #include "../deathtypes/all.qh"
-    #include <server/mutators/all.qh>
+    #include <server/mutators/_all.qh>
        #include <server/steerlib.qh>
        #include "../turrets/sv_turrets.qh"
        #include "../turrets/util.qh"

diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc
index e4f082355bd9ad47d184b50a33f11116c26e3d78..49d2c57b70c3a2cf45609ae45ae611c670e054ce 100644 (file)
--- a/qcsrc/common/notifications/all.qc
+++ b/qcsrc/common/notifications/all.qc
@@ -8,7 +8,7 @@
        #include <server/constants.qh>
        #include <server/defs.qh>
        #include "all.qh"
-       #include <server/mutators/all.qh>
+       #include <server/mutators/_all.qh>
 #endif
 
 // ================================================

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index bc914d853da3594145faeb8d21e7cc653cbb241b..32e718ae296cb4734941d3549918e2943a1fe046 100644 (file)
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -6,7 +6,7 @@
 
     #include "../server/bot/api.qh"
 
-    #include <server/mutators/all.qh>
+    #include <server/mutators/_all.qh>
 
     #include "../server/weapons/common.qh"
     #include "../server/weapons/selection.qh"

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index d1bd2d7e649da0c9bdb8c32a1a80e8890ecae573..81790e6c02e31939fc7d66aebe6c34fc5d080870 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -37,7 +37,7 @@
     #include <server/defs.qh>
     #include "../notifications/all.qh"
     #include "../deathtypes/all.qh"
-    #include <server/mutators/all.qh>
+    #include <server/mutators/_all.qh>
     #include "../mapinfo.qh"
     #include <server/command/_all.qh>
     #include <lib/csqcmodel/sv_model.qh>

diff --git a/qcsrc/menu/command/_all.inc b/qcsrc/menu/command/_all.inc
index 8bc63f720a6aecec25c3ac6643889c516ec2a01e..2e1b0ab9ecb4dd2a58b4f94586979376a3d8655b 100644 (file)
--- a/qcsrc/menu/command/_all.inc
+++ b/qcsrc/menu/command/_all.inc
@@ -1,2 +1,4 @@
 #include "_all.qh"
 #include "_mod.inc"
+
+#include <common/command/_all.inc>

diff --git a/qcsrc/menu/command/_all.qh b/qcsrc/menu/command/_all.qh
index 947026dd5982828e0832769a60ca8e4cf119ce6b..9b89bcdc10056e9421a4321c9f2b9afd3afa4d42 100644 (file)
--- a/qcsrc/menu/command/_all.qh
+++ b/qcsrc/menu/command/_all.qh
@@ -1,2 +1,4 @@
 #pragma once
 #include "_mod.qh"
+
+#include <common/command/_all.qh>

diff --git a/qcsrc/menu/command/_mod.inc b/qcsrc/menu/command/_mod.inc
index e721f357a3953f975ff1b1de84bf0d2f627506d0..0bcef50de71c6d6f4b59d1a8574916f6c2866652 100644 (file)
--- a/qcsrc/menu/command/_mod.inc
+++ b/qcsrc/menu/command/_mod.inc
@@ -1,3 +1,2 @@
 // generated file; do not modify
-#include <menu/command/all.qc>
 #include <menu/command/menu_cmd.qc>

diff --git a/qcsrc/menu/command/_mod.qh b/qcsrc/menu/command/_mod.qh
index 5e66557301f031473d87d5506f1ce672af33b80f..91c0a8f35e80a23ccdc487acb7a1ba1853d107e6 100644 (file)
--- a/qcsrc/menu/command/_mod.qh
+++ b/qcsrc/menu/command/_mod.qh
@@ -1,3 +1,2 @@
 // generated file; do not modify
-#include <menu/command/all.qh>
 #include <menu/command/menu_cmd.qh>

diff --git a/qcsrc/menu/command/all.qc b/qcsrc/menu/command/all.qc
deleted file mode 100644 (file)
index 63b9b78..0000000
--- a/qcsrc/menu/command/all.qc
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "all.qh"
-
-#include <common/command/_all.inc>

diff --git a/qcsrc/menu/command/all.qh b/qcsrc/menu/command/all.qh
deleted file mode 100644 (file)
index 6f70f09..0000000
--- a/qcsrc/menu/command/all.qh
+++ /dev/null
@@ -1 +0,0 @@
-#pragma once

diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc
index 15dfb0b9b45d96d898a493b6cd91a9f0f3e23ee8..df874e3ebc9f47e252a2cf19172bb00a12a8427f 100644 (file)
--- a/qcsrc/server/bot/default/aim.qc
+++ b/qcsrc/server/bot/default/aim.qc
@@ -9,7 +9,7 @@
 
 #include "../../weapons/weaponsystem.qh"
 
-#include "../../mutators/all.qh"
+#include "../../mutators/_all.qh"
 
 // traces multiple trajectories to find one that will impact the target
 // 'end' vector is the place it aims for,

diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc
index cab38143db598d743f377c3556736116782e2f84..3f117de841ebb188f47ae1c92c2b2466f5190af3 100644 (file)
--- a/qcsrc/server/bot/default/bot.qc
+++ b/qcsrc/server/bot/default/bot.qc
@@ -21,7 +21,7 @@
 #include "../../race.qh"
 #include <common/t_items.qh>
 
-#include "../../mutators/all.qh"
+#include "../../mutators/_all.qh"
 
 #include "../../weapons/accuracy.qh"
 

diff --git a/qcsrc/server/bot/null/_mod.inc b/qcsrc/server/bot/null/_mod.inc
new file mode 100644 (file)
index 0000000..d40f451
--- /dev/null
+++ b/qcsrc/server/bot/null/_mod.inc
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <server/bot/null/bot_null.qc>

diff --git a/qcsrc/server/bot/null/_mod.qh b/qcsrc/server/bot/null/_mod.qh
new file mode 100644 (file)
index 0000000..0449a1c
--- /dev/null
+++ b/qcsrc/server/bot/null/_mod.qh
@@ -0,0 +1,2 @@
+// generated file; do not modify
+#include <server/bot/null/bot_null.qh>

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index f31b3e5c2fba778c65c908de8aba6d2ef89d2528..a5858a9e068f65605d6382b7bef941b985d7e0c8 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -4,7 +4,7 @@
 #include "race.qh"
 #include "../common/triggers/teleporters.qh"
 
-#include "mutators/all.qh"
+#include "mutators/_all.qh"
 
 #include "weapons/tracing.qh"
 

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 33f5716658b13a3bff9bb44513f8259b61e80748..19ee99a1ae60b356b43ac9e7aedad7526e175d98 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -12,7 +12,7 @@
 #include "../scores.qh"
 #include "../teamplay.qh"
 
-#include "../mutators/all.qh"
+#include "../mutators/_all.qh"
 
 #ifdef SVQC
        #include <common/vehicles/all.qh>

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 720ad01f63870d83e80828881069b8145fa505cf..18a424a1da8e66f625c887b8310a30318aeae22b 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -18,7 +18,7 @@
 
 #include "../bot/api.qh"
 
-#include "../mutators/all.qh"
+#include "../mutators/_all.qh"
 
 #include <common/constants.qh>
 #include <common/mapinfo.qh>

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index f93e9c7182be703a68c1e00a542a49506f6e6e25..d03ed3489db1bb732fd75feb84dc93a78b370a74 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -10,7 +10,7 @@
 #include "../round_handler.qh"
 #include "../scores.qh"
 
-#include "../mutators/all.qh"
+#include "../mutators/_all.qh"
 
 #include <common/constants.qh>
 #include <common/mapinfo.qh>

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index d7e9b07c05279a5c26a7f67655d9039ca4339c1a..5ec8141e0d8a21bef0d963e3bd194e0b01d24848 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -2,7 +2,7 @@
 
 #include "bot/api.qh"
 #include "g_hook.qh"
-#include "mutators/all.qh"
+#include "mutators/_all.qh"
 #include "scores.qh"
 #include "spawnpoints.qh"
 #include "../common/state.qh"

diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh
index f11c82c84d2bd1c0019fa350322687ba60997eb4..eb6a1cba0a205a08eaf9ece2ce4f6931e54e9fb8 100644 (file)
--- a/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@ -17,7 +17,7 @@
     #include "defs.qh"
     #include <common/notifications/all.qh>
     #include <common/deathtypes/all.qh>
-    #include "mutators/all.qh"
+    #include "mutators/_all.qh"
     #include <common/turrets/sv_turrets.qh>
     #include <common/vehicles/all.qh>
     #include <lib/csqcmodel/sv_model.qh>

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 27fe5c1ef395653d8b296185b1c01794c7fac772..8f10ea9dbb9b2fa18be95d6019ecfce192980485 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -13,7 +13,7 @@
 #include "g_hook.qh"
 #include "ipban.qh"
 #include "mapvoting.qh"
-#include "mutators/all.qh"
+#include "mutators/_all.qh"
 #include "race.qh"
 #include "scores.qh"
 #include "teamplay.qh"

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index a177cdc64e0cc2d51bbf595a8ed0fd6d4a4556d1..a88b4be5679635121b56692ea4b38487b634037b 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -4,7 +4,7 @@
 #include "constants.qh"
 #include "g_hook.qh"
 #include "ipban.qh"
-#include "mutators/all.qh"
+#include "mutators/_all.qh"
 #include "../common/t_items.qh"
 #include "weapons/accuracy.qh"
 #include "weapons/csqcprojectile.qh"

diff --git a/qcsrc/server/mutators/_all.inc b/qcsrc/server/mutators/_all.inc
index 8bc63f720a6aecec25c3ac6643889c516ec2a01e..65d709243e5dee574991949685bb61296b4d2544 100644 (file)
--- a/qcsrc/server/mutators/_all.inc
+++ b/qcsrc/server/mutators/_all.inc
@@ -1,2 +1,4 @@
 #include "_all.qh"
 #include "_mod.inc"
+
+#include "mutator/_all.inc"

diff --git a/qcsrc/server/mutators/_all.qh b/qcsrc/server/mutators/_all.qh
index 947026dd5982828e0832769a60ca8e4cf119ce6b..bae58a55c5fcca59e7f4dab308891e4a833853d9 100644 (file)
--- a/qcsrc/server/mutators/_all.qh
+++ b/qcsrc/server/mutators/_all.qh
@@ -1,2 +1,4 @@
 #pragma once
 #include "_mod.qh"
+
+#include "mutator/_all.qh"

diff --git a/qcsrc/server/mutators/_mod.inc b/qcsrc/server/mutators/_mod.inc
index 3d2321896cb5374a8e045bb256c8c4ceba909b50..582c2852f38d8a3482dcd0055a6d773e2fc3cf71 100644 (file)
--- a/qcsrc/server/mutators/_mod.inc
+++ b/qcsrc/server/mutators/_mod.inc
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include <server/mutators/all.qc>
+#include <server/mutators/loader.qc>

diff --git a/qcsrc/server/mutators/_mod.qh b/qcsrc/server/mutators/_mod.qh
index 8feb1f37d8c2f29a6245bf1e5cc76c845ec06720..9ba0319fe4d4275b118facf80c33d57165cdadd2 100644 (file)
--- a/qcsrc/server/mutators/_mod.qh
+++ b/qcsrc/server/mutators/_mod.qh
@@ -1,2 +1,2 @@
 // generated file; do not modify
-#include <server/mutators/all.qh>
+#include <server/mutators/loader.qh>

diff --git a/qcsrc/server/mutators/all.inc b/qcsrc/server/mutators/all.inc
deleted file mode 100644 (file)
index 1a80b44..0000000
--- a/qcsrc/server/mutators/all.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "mutator/gamemode_assault.qc"
-#include "mutator/gamemode_ca.qc"
-#include "mutator/gamemode_ctf.qc"
-#include "mutator/gamemode_cts.qc"
-#include "mutator/gamemode_deathmatch.qc"
-#include "mutator/gamemode_domination.qc"
-#include "mutator/gamemode_freezetag.qc"
-#include "mutator/gamemode_invasion.qc"
-#include "mutator/gamemode_keepaway.qc"
-#include "mutator/gamemode_keyhunt.qc"
-#include "mutator/gamemode_lms.qc"
-#include "mutator/gamemode_race.qc"
-#include "mutator/gamemode_tdm.qc"

diff --git a/qcsrc/server/mutators/all.qc b/qcsrc/server/mutators/all.qc
deleted file mode 100644 (file)
index 0e8a607..0000000
--- a/qcsrc/server/mutators/all.qc
+++ /dev/null
@@ -1,85 +0,0 @@
-#include "all.qh"
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-    #include <lib/warpzone/anglestransform.qh>
-    #include <lib/warpzone/common.qh>
-    #include <lib/warpzone/util_server.qh>
-    #include <lib/warpzone/server.qh>
-    #include <common/constants.qh>
-    #include <common/stats.qh>
-    #include <common/teams.qh>
-    #include <common/util.qh>
-    #include <common/command/_all.qh>
-    #include <common/net_notice.qh>
-    #include <common/animdecide.qh>
-    #include <common/monsters/all.qh>
-    #include <common/monsters/sv_monsters.qh>
-    #include <common/monsters/spawn.qh>
-    #include <common/weapons/config.qh>
-    #include <common/weapons/all.qh>
-    #include "../weapons/accuracy.qh"
-    #include "../weapons/common.qh"
-    #include "../weapons/csqcprojectile.qh"
-    #include "../weapons/hitplot.qh"
-    #include "../weapons/selection.qh"
-    #include "../weapons/spawning.qh"
-    #include "../weapons/throwing.qh"
-    #include "../weapons/tracing.qh"
-    #include "../weapons/weaponstats.qh"
-    #include "../weapons/weaponsystem.qh"
-    #include <common/t_items.qh>
-    #include "../autocvars.qh"
-    #include "../constants.qh"
-    #include "../defs.qh"
-    #include <common/notifications/all.qh>
-    #include <common/deathtypes/all.qh>
-    #include "all.qh"
-    #include <common/turrets/sv_turrets.qh>
-    #include <common/vehicles/all.qh>
-    #include "../campaign.qh"
-    #include <common/campaign_common.qh>
-    #include <common/mapinfo.qh>
-    #include "../command/common.qh"
-    #include "../command/banning.qh"
-    #include "../command/radarmap.qh"
-    #include "../command/vote.qh"
-    #include "../command/getreplies.qh"
-    #include "../command/cmd.qh"
-    #include "../command/sv_cmd.qh"
-    #include <common/csqcmodel_settings.qh>
-    #include <lib/csqcmodel/common.qh>
-    #include <lib/csqcmodel/sv_model.qh>
-    #include "../anticheat.qh"
-    #include "../cheats.qh"
-    #include <common/playerstats.qh>
-    #include "../portals.qh"
-    #include "../g_hook.qh"
-    #include "../scores.qh"
-    #include "../spawnpoints.qh"
-    #include "../mapvoting.qh"
-    #include "../ipban.qh"
-    #include "../race.qh"
-    #include "../antilag.qh"
-    #include "../playerdemo.qh"
-    #include "../round_handler.qh"
-    #include "../item_key.qh"
-    #include "../pathlib/pathlib.qh"
-    #include <common/vehicles/all.qh>
-#endif
-
-#include "all.qh"
-
-STATIC_INIT_LATE(Gametype) {
-    Gametype g = MapInfo_CurrentGametype();
-    if (g) {
-        for (string _s = g.m_mutators; _s != ""; _s = cdr(_s)) {
-            string s = car(_s);
-            FOREACH(Mutators, it.m_name == s, LAMBDA(Mutator_Add(it); break));
-        }
-    }
-}
-
-#define IMPLEMENTATION
-#include "all.inc"
-#undef IMPLEMENTATION

diff --git a/qcsrc/server/mutators/all.qh b/qcsrc/server/mutators/all.qh
deleted file mode 100644 (file)
index 4a1f2b3..0000000
--- a/qcsrc/server/mutators/all.qh
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "mutator.qh"
-#include "gamemode.qh"
-
-#include "all.inc"

diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh
index 85910ced8c05e1d4dcb10d3edc49a5dc609b35df..81cb382b7676008d9ab189b44bad975b2e4aa183 100644 (file)
--- a/qcsrc/server/mutators/gamemode.qh
+++ b/qcsrc/server/mutators/gamemode.qh
@@ -1,5 +1,73 @@
 #pragma once
 
+#include "mutator.qh"
+
+// TODO: trim
+
+#include <lib/warpzone/anglestransform.qh>
+#include <lib/warpzone/common.qh>
+#include <lib/warpzone/util_server.qh>
+#include <lib/warpzone/server.qh>
+#include <common/constants.qh>
+#include <common/stats.qh>
+#include <common/teams.qh>
+#include <common/util.qh>
+#include <common/command/_all.qh>
+#include <common/net_notice.qh>
+#include <common/animdecide.qh>
+#include <common/monsters/all.qh>
+#include <common/monsters/sv_monsters.qh>
+#include <common/monsters/spawn.qh>
+#include <common/weapons/config.qh>
+#include <common/weapons/all.qh>
+#include <server/weapons/accuracy.qh>
+#include <server/weapons/common.qh>
+#include <server/weapons/csqcprojectile.qh>
+#include <server/weapons/hitplot.qh>
+#include <server/weapons/selection.qh>
+#include <server/weapons/spawning.qh>
+#include <server/weapons/throwing.qh>
+#include <server/weapons/tracing.qh>
+#include <server/weapons/weaponstats.qh>
+#include <server/weapons/weaponsystem.qh>
+#include <common/t_items.qh>
+#include <server/autocvars.qh>
+#include <server/constants.qh>
+#include <server/defs.qh>
+#include <common/notifications/all.qh>
+#include <common/deathtypes/all.qh>
+#include <common/turrets/sv_turrets.qh>
+#include <common/vehicles/all.qh>
+#include <server/campaign.qh>
+#include <common/campaign_common.qh>
+#include <common/mapinfo.qh>
+#include <server/command/common.qh>
+#include <server/command/banning.qh>
+#include <server/command/radarmap.qh>
+#include <server/command/vote.qh>
+#include <server/command/getreplies.qh>
+#include <server/command/cmd.qh>
+#include <server/command/sv_cmd.qh>
+#include <common/csqcmodel_settings.qh>
+#include <lib/csqcmodel/common.qh>
+#include <lib/csqcmodel/sv_model.qh>
+#include <server/anticheat.qh>
+#include <server/cheats.qh>
+#include <common/playerstats.qh>
+#include <server/portals.qh>
+#include <server/g_hook.qh>
+#include <server/scores.qh>
+#include <server/spawnpoints.qh>
+#include <server/mapvoting.qh>
+#include <server/ipban.qh>
+#include <server/race.qh>
+#include <server/antilag.qh>
+#include <server/playerdemo.qh>
+#include <server/round_handler.qh>
+#include <server/item_key.qh>
+#include <server/pathlib/pathlib.qh>
+#include <common/vehicles/all.qh>
+
 #include <server/cl_client.qh>
 #include <server/cl_player.qh>
 #include <server/cl_impulse.qh>

diff --git a/qcsrc/server/mutators/loader.qc b/qcsrc/server/mutators/loader.qc
new file mode 100644 (file)
index 0000000..1784e72
--- /dev/null
+++ b/qcsrc/server/mutators/loader.qc
@@ -0,0 +1,11 @@
+#include "loader.qh"
+
+STATIC_INIT_LATE(Gametype) {
+    Gametype g = MapInfo_CurrentGametype();
+    if (g) {
+        for (string _s = g.m_mutators; _s != ""; _s = cdr(_s)) {
+            string s = car(_s);
+            FOREACH(Mutators, it.m_name == s, LAMBDA(Mutator_Add(it); break));
+        }
+    }
+}

diff --git a/qcsrc/server/mutators/loader.qh b/qcsrc/server/mutators/loader.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
+++ b/qcsrc/server/mutators/loader.qh
@@ -0,0 +1 @@
+#pragma once

diff --git a/qcsrc/server/mutators/mutator/_all.inc b/qcsrc/server/mutators/mutator/_all.inc
index 8bc63f720a6aecec25c3ac6643889c516ec2a01e..f72fb7539170d56ced4ecf7aa215d9cc6fd98164 100644 (file)
--- a/qcsrc/server/mutators/mutator/_all.inc
+++ b/qcsrc/server/mutators/mutator/_all.inc
@@ -1,2 +1,4 @@
 #include "_all.qh"
+#define IMPLEMENTATION
 #include "_mod.inc"
+#undef IMPLEMENTATION

diff --git a/qcsrc/server/mutators/mutator/_all.qh b/qcsrc/server/mutators/mutator/_all.qh
index 947026dd5982828e0832769a60ca8e4cf119ce6b..d720bcf4190f6f72f36928ba6313b68119bf7cbf 100644 (file)
--- a/qcsrc/server/mutators/mutator/_all.qh
+++ b/qcsrc/server/mutators/mutator/_all.qh
@@ -1,2 +1,3 @@
 #pragma once
-#include "_mod.qh"
+// TODO: _mod.qh
+#include "_mod.inc"

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index 8a40b111840a34ebf2198ba53787d00fc59a8d2a..a9d9600a759096b2b9c48d63f64fd607020766b3 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -1,7 +1,7 @@
 #include "portals.qh"
 
 #include "g_hook.qh"
-#include "mutators/all.qh"
+#include "mutators/_all.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/notifications/all.qh"

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index e3d5fd9d72e5e0da5a904528c8ded99b87dd7a7e..f2a6265ae73894b8ea9e061c69e3b38f7cac0365 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -1,7 +1,7 @@
 #include "scores.qh"
 
 #include "command/common.qh"
-#include "mutators/all.qh"
+#include "mutators/_all.qh"
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"
 

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 958b0bd6e3a7c7ddf8ebefced698652592d80f19..cc020b8a30776a6e7b76823f4402b1aa221c6961 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,6 +1,6 @@
 #include "spawnpoints.qh"
 
-#include "mutators/all.qh"
+#include "mutators/_all.qh"
 #include "g_world.qh"
 #include "race.qh"
 #include "../common/constants.qh"

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 4a72bb1aee81d2444355b7d305d37ed83b32c13c..15d4269501e2815fae0b48434b8c0df9f2545603 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -8,7 +8,7 @@
 
 #include "command/common.qh"
 
-#include "mutators/all.qh"
+#include "mutators/_all.qh"
 #include "weapons/csqcprojectile.qh"
 
 #include "../common/constants.qh"

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 56f85bd4689fd47a7f189dec8d57949435213adf..1d742375d1a17c51e95381b98c3f06ca7b08ce69 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -9,7 +9,7 @@
 
 #include "command/vote.qh"
 
-#include "mutators/all.qh"
+#include "mutators/_all.qh"
 
 #include "../common/deathtypes/all.qh"
 #include "../common/gamemodes/all.qh"

diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc
index 9efc4ce6a0700f31511eb9dfb2c9a5ae56e92cb9..c2ed3fedb06d466d0b6e77fe743b81c975c92508 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qc
+++ b/qcsrc/server/weapons/accuracy.qc
@@ -1,6 +1,6 @@
 #include "accuracy.qh"
 
-#include "../mutators/all.qh"
+#include "../mutators/_all.qh"
 #include <common/constants.qh>
 #include <common/teams.qh>
 #include <common/util.qh>

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index faec22f307315b37f06b47b40d72d0e64cb272e5..89b4f26cfb850dcbaefcbb1321d60085d075aa34 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,7 +1,7 @@
 #include "spawning.qh"
 
 #include "weaponsystem.qh"
-#include "../mutators/all.qh"
+#include "../mutators/_all.qh"
 #include <common/t_items.qh>
 #include <common/weapons/all.qh>
 

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 7cc7580c17dd8922b894cc141e47fd63de9d70a0..398dcddcb2d57477aba32c0c62af146c9fc592d2 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -1,7 +1,7 @@
 #include "throwing.qh"
 
 #include "weaponsystem.qh"
-#include "../mutators/all.qh"
+#include "../mutators/_all.qh"
 #include <common/t_items.qh>
 #include "../g_damage.qh"
 #include <common/items/item.qh>

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index c0ed81e68173da34f4c819e6701e924cf2f6f748..f3851f5e37d455c2f403eace0f78fdf46b1e5959 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -3,7 +3,7 @@
 #include "selection.qh"
 
 #include "../command/common.qh"
-#include "../mutators/all.qh"
+#include "../mutators/_all.qh"
 #include "../round_handler.qh"
 #include <common/t_items.qh>
 #include <common/animdecide.qh>