Purge direct includes of mutators/events.qh in favour of the _mod files

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 62b732bec25034e773801113d86aa9f268bfcbf4..bcbe7244692eb85bb4c6c28fcf8e8c0b111fc252 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,6 +1,6 @@
 #include "announcer.qh"
 
-#include "mutators/events.qh"
+#include <client/mutators/_mod.qh>
 
 #include <common/notifications/all.qh>
 #include <common/stats.qh>

diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc
index 8eea240d40f4da8ebdd79bb9dee4a30b364e19b2..5a53be8e7967983a316bda15262dce7d2433aac9 100644 (file)
--- a/qcsrc/client/commands/cl_cmd.qc
+++ b/qcsrc/client/commands/cl_cmd.qc
@@ -14,7 +14,7 @@
 #include "../mapvoting.qh"
 #include "../miscfunctions.qh"
 
-#include "../mutators/events.qh"
+#include <client/mutators/_mod.qh>
 
 #include <common/mapinfo.qh>
 

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 6499a683e8f4c2cf198be39cb0bee2c9eb9e9a3f..37e18bd8e0b17f4a4e5e4e4a08a3766fba9993aa 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -2,7 +2,7 @@
 #include "autocvars.qh"
 #include "csqcmodel_hooks.qh"
 #include "miscfunctions.qh"
-#include "mutators/events.qh"
+#include <client/mutators/_mod.qh>
 #include "player_skeleton.qh"
 #include "weapons/projectile.qh"
 #include <common/animdecide.qh>

diff --git a/qcsrc/client/hud/panel.qh b/qcsrc/client/hud/panel.qh
index 66ca0772b602933b25d56b0af4a628616863f985..1ea23ae2e758531f19ce24d40843062252a3e277 100644 (file)
--- a/qcsrc/client/hud/panel.qh
+++ b/qcsrc/client/hud/panel.qh
@@ -2,4 +2,4 @@
 
 #include "hud.qh"
 #include "hud_config.qh"
-#include <client/mutators/events.qh>
+#include <client/mutators/_mod.qh>

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 22556e2aec452e4d7f42b2e0d1ccdf80a365b127..efb1fa204eed951d8014b976eee0528865dc8f94 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -9,7 +9,7 @@
 #include <common/effects/all.inc>
 #include "hud/_mod.qh"
 #include "mapvoting.qh"
-#include "mutators/events.qh"
+#include <client/mutators/_mod.qh>
 #include "hud/panel/scoreboard.qh"
 #include "hud/panel/quickmenu.qh"
 #include "shownames.qh"

diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index 220b9c6127ef958dd0b07c6312b44842240ac6e5..bb1b6f919b840c78a2bca6d339245e5b057acbc1 100644 (file)
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -2,7 +2,7 @@
 
 #include <common/physics/movetypes/movetypes.qh>
 #include <common/physics/player.qh>
-#include "mutators/events.qh"
+#include <client/mutators/_mod.qh>
 #include "../lib/csqcmodel/cl_player.qh"
 #include "../lib/warpzone/anglestransform.qh"
 

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index fa5a79207e10519a7a3b1e1c106889d3d7e8ebe6..a1b53fb82c54b09bc336c0ff9902ad1910f2511c 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -9,7 +9,7 @@
 #include "hud/panel/scoreboard.qh"
 #include "hud/panel/quickmenu.qh"
 
-#include "mutators/events.qh"
+#include <client/mutators/_mod.qh>
 
 #include <common/animdecide.qh>
 #include <common/deathtypes/all.qh>

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 089c7df11fd326f0598f0243c59933a50a8a03a5..444fb27431136a3c6540830276987daba1a474f7 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -3,7 +3,7 @@
 #include "../autocvars.qh"
 #include "../defs.qh"
 #include "../main.qh"
-#include "../mutators/events.qh"
+#include <client/mutators/_mod.qh>
 
 #include <common/constants.qh>
 #include <common/effects/effect.qh>

diff --git a/qcsrc/common/effects/qc/damageeffects.qh b/qcsrc/common/effects/qc/damageeffects.qh
index 2a1d587ca497d3ee57680684ad5c88b547568149..68b43b17608094c8cdddcd2725a3f607765940e4 100644 (file)
--- a/qcsrc/common/effects/qc/damageeffects.qh
+++ b/qcsrc/common/effects/qc/damageeffects.qh
@@ -3,7 +3,7 @@
 #ifdef CSQC
 #include <common/deathtypes/all.qh>
 #include <common/physics/movetypes/movetypes.qh>
-#include <client/mutators/events.qh>
+#include <client/mutators/_mod.qh>
 #include <common/vehicles/all.qh>
 #include <common/weapons/_all.qh>
 #endif

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 53b67c90357e5a2519d37abf066ade0de4422ee2..183302b3a1e0460c246c9c1c8357edfbace43c53 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -2,7 +2,7 @@
 
 #if defined(CSQC)
     #include "constants.qh"
-       #include "../client/mutators/events.qh"
+       #include <client/mutators/_mod.qh>
     #include "mapinfo.qh"
     #include "notifications/all.qh"
        #include "scores.qh"
@@ -10,7 +10,7 @@
 #elif defined(MENUQC)
 #elif defined(SVQC)
     #include "constants.qh"
-       #include "../server/mutators/events.qh"
+       #include <server/mutators/_mod.qh>
     #include "notifications/all.qh"
     #include <common/deathtypes/all.qh>
        #include "scores.qh"

diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc
index e727b39e6446acbb10e8745c5b0a5bb93d3fcdea..bd45230c97ab61964f43a7153d69242fb896e38c 100644 (file)
--- a/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@ -3,7 +3,7 @@
 #include "../menu.qh"
 #include "../item.qh"
 
-#include "../mutators/events.qh"
+#include <menu/mutators/_mod.qh>
 
 #include <common/command/_mod.qh>
 

diff --git a/qcsrc/menu/mutators/_mod.inc b/qcsrc/menu/mutators/_mod.inc
index 98fb4815c1ce28cc699a429537ea75c2643b4487..26980926907738b2dcf21eff8fd91fb0392e639f 100644 (file)
--- a/qcsrc/menu/mutators/_mod.inc
+++ b/qcsrc/menu/mutators/_mod.inc
@@ -1 +1,2 @@
 // generated file; do not modify
+#include <menu/mutators/events.qc>

diff --git a/qcsrc/menu/mutators/_mod.qh b/qcsrc/menu/mutators/_mod.qh
index 98fb4815c1ce28cc699a429537ea75c2643b4487..93432be42cad402636ed8ad992678b44471b873f 100644 (file)
--- a/qcsrc/menu/mutators/_mod.qh
+++ b/qcsrc/menu/mutators/_mod.qh
@@ -1 +1,2 @@
 // generated file; do not modify
+#include <menu/mutators/events.qh>

diff --git a/qcsrc/menu/mutators/events.qc b/qcsrc/menu/mutators/events.qc
new file mode 100644 (file)
index 0000000..c2dbb70
--- /dev/null
+++ b/qcsrc/menu/mutators/events.qc
@@ -0,0 +1 @@
+#include "events.qh"

diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc
index 0afd27c8d67ee5802309671cc895bf37f3dd34fa..110b796be61d09ce0375b4827ec663fc1707e773 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.qc
+++ b/qcsrc/menu/xonotic/mainwindow.qc
@@ -1,6 +1,6 @@
 #include "mainwindow.qh"
 
-#include "../mutators/events.qh"
+#include <menu/mutators/_mod.qh>
 
 #include "nexposee.qh"
 #include "inputbox.qh"

diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc
index 383ead19431caf409d052165203f23a8da05b26a..3a9befde403f9ee2a8fb6c2f99076af8ca433d9f 100644 (file)
--- a/qcsrc/server/bot/default/aim.qc
+++ b/qcsrc/server/bot/default/aim.qc
@@ -11,7 +11,7 @@
 
 #include "../../weapons/weaponsystem.qh"
 
-#include "../../mutators/_mod.qh"
+#include <server/mutators/_mod.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 b4272e3e0648224f6de70f8a1e2bd8f871bb0b5c..976d67ec996d3e28c67088d95d19798c584d037b 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/_mod.qh"
+#include <server/mutators/_mod.qh>
 
 #include "../../weapons/accuracy.qh"
 

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 9751c6cf2185ac0f4b8447be03fe08017874223b..f71cb494b9beb1b07ba3ed3d75f8a108201b1e7f 100644 (file)
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -9,7 +9,7 @@
 #include "race.qh"
 #include "../common/mapobjects/teleporters.qh"
 
-#include "mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 
 #include "weapons/tracing.qh"
 

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 2267c144a3ba68ba6bd48da2f3adfd23e8c76e6f..8111a64ef89214cd56cf5a6780255eed2c6aa9d5 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -16,7 +16,7 @@
 #include "../scores.qh"
 #include "../teamplay.qh"
 
-#include "../mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include <common/gamemodes/_mod.qh>
 
 #ifdef SVQC

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 35b172e7fd48ceadab44a33e7a039f2d3002aba7..0471cff0721aa4f61d6ad165d497d152d24e3419 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -20,7 +20,7 @@
 
 #include "../bot/api.qh"
 
-#include "../mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include <common/gamemodes/_mod.qh>
 
 #include <common/constants.qh>

diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 48cf949d4e1a03d21b9c7a12da83e34ff0c05cf5..5f034f12f88534e9f644eeba88bed1351246ecb2 100644 (file)
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -14,7 +14,7 @@
 #include "../round_handler.qh"
 #include "../scores.qh"
 
-#include "../mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include <common/gamemodes/_mod.qh>
 
 #include <common/constants.qh>

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 21c00738ff3b113a2af00e4ddd569d640335dbf8..cefeb316a1f4ab6e5fac98ecf52421b8564cc1b6 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -3,7 +3,7 @@
 #include <common/effects/all.qh>
 #include "bot/api.qh"
 #include "g_hook.qh"
-#include "mutators/_mod.qh"
+#include <server/mutators/_mod.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 9c4983fee1b7d34c28483d8743b75dee015e7a69..9ab817853b0754a5ead77fccd73ff8cd16624eb0 100644 (file)
--- a/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@ -19,7 +19,7 @@
     #include "defs.qh"
     #include <common/notifications/all.qh>
     #include <common/deathtypes/all.qh>
-    #include "mutators/_mod.qh"
+    #include <server/mutators/_mod.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 48bc63bbc07e2b0beaaecadd57199b48b0a32d52..842f5b53c71c4887bb0a50d82cbdc568c2cb2876 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/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include "race.qh"
 #include "scores.qh"
 #include "teamplay.qh"

diff --git a/qcsrc/server/items.qc b/qcsrc/server/items.qc
index 8a1768a8c58263434d67627260c7ae76cf31aaa5..b21df78e3f247cb53b809446f95a555c25c86bcb 100644 (file)
--- a/qcsrc/server/items.qc
+++ b/qcsrc/server/items.qc
@@ -5,7 +5,7 @@
 /// game items.
 /// \copyright GNU GPLv2 or any later version.
 
-#include "mutators/events.qh"
+#include <server/mutators/_mod.qh>
 #include <common/weapons/all.qh>
 #include <common/mapobjects/subs.qh>
 

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 25ba4b9f54991cf1dc18815e0d15b8bfffee6a8b..1a885f78f0bf3f508b85de78f6fd2a131506dd90 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -5,7 +5,7 @@
 #include "constants.qh"
 #include "g_hook.qh"
 #include "ipban.qh"
-#include "mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include "../common/t_items.qh"
 #include "resources.qh"
 #include "items.qh"

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index df69ade2861fcbcc4f6372be2e72ec12f85b6d27..92707bf39494e9fd964f508fc7894d60d789be41 100644 (file)
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -5,7 +5,7 @@
 
 #include <common/t_items.qh>
 
-#include "mutators/events.qh"
+#include <server/mutators/_mod.qh>
 
 #include <common/constants.qh>
 #include <common/mapinfo.qh>

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

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

diff --git a/qcsrc/server/mutators/events.qc b/qcsrc/server/mutators/events.qc
new file mode 100644 (file)
index 0000000..c2dbb70
--- /dev/null
+++ b/qcsrc/server/mutators/events.qc
@@ -0,0 +1 @@
+#include "events.qh"

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 166c642559437d108e8a42cd50f7b225ef50ee1d..2cb40a83492d88f454622f2c6dc9a6a47b7a7d15 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -4,8 +4,7 @@
 #include "defs.qh"
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>
-//#include "mutators/_mod.qh"
-#include "mutators/events.qh"
+#include <server/mutators/_mod.qh>
 #include <common/net_linked.qh>
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"

diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 6cfd45b101ec9f998db67b0a0232306ddc362a7d..dcf6016c5e326b902e8c59f06519ab86215ee707 100644 (file)
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -1,6 +1,6 @@
 #include "spawnpoints.qh"
 
-#include "mutators/events.qh"
+#include <server/mutators/_mod.qh>
 #include "g_world.qh"
 #include "race.qh"
 #include "defs.qh"

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 6d412bacea5981e2d40a6a68a4f91ba510307648..326c8d96092cd16c167bbe4a5edd5e53854a1131 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -9,7 +9,7 @@
 
 #include "command/common.qh"
 
-#include "mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include "weapons/csqcprojectile.qh"
 
 #include "../common/constants.qh"

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index a30e4696dd555d6010ad912afff04092991d245d..d9bab5d7f894cd1346f60c507becb6d4009586eb 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -9,7 +9,7 @@
 
 #include "command/vote.qh"
 
-#include "mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 
 #include "../common/deathtypes/all.qh"
 #include <common/gamemodes/_mod.qh>

diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc
index 1eda4e25b1066c86831ef2cb679bccd7993a6ce8..2d553ba1685b1a62bb6f6dade746acd9042c72b2 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qc
+++ b/qcsrc/server/weapons/accuracy.qc
@@ -1,6 +1,6 @@
 #include "accuracy.qh"
 
-#include "../mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include <common/constants.qh>
 #include <common/net_linked.qh>
 #include <common/teams.qh>

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 17f2ddeeee2bb567271f1f689c8376494168a5a6..204b5a7633669ffeac43adcf5c6da6013939d703 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -2,7 +2,7 @@
 
 #include "weaponsystem.qh"
 #include "../resources.qh"
-#include "../mutators/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include <common/t_items.qh>
 #include <server/items.qh>
 #include <common/weapons/_all.qh>

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index dcf9ee41b33f2805c2364b4c909bda592ff4feb7..462af14d8e0ca151f366f9daa611f1caf3c00cc7 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -3,7 +3,7 @@
 #include "weaponsystem.qh"
 #include "../resources.qh"
 #include "../items.qh"
-#include "../mutators/_mod.qh"
+#include <server/mutators/_mod.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 dd0e35b955168e9b220d86afd26120ac4460c3a0..9c62ec22e4eed0c7843e5af10566ee1b77c7c5ff 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/_mod.qh"
+#include <server/mutators/_mod.qh>
 #include "../round_handler.qh"
 #include <server/resources.qh>
 #include <common/t_items.qh>