Purge direct includes of mutators/events.qh in favour of the _mod files
authorMario <mario@smbclan.net>
Mon, 11 Jun 2018 04:45:51 +0000 (14:45 +1000)
committerMario <mario@smbclan.net>
Mon, 11 Jun 2018 04:45:51 +0000 (14:45 +1000)
38 files changed:
qcsrc/client/announcer.qc
qcsrc/client/commands/cl_cmd.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hud/panel.qh
qcsrc/client/main.qc
qcsrc/client/player_skeleton.qc
qcsrc/client/view.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/effects/qc/damageeffects.qh
qcsrc/common/util.qc
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/mutators/_mod.inc
qcsrc/menu/mutators/_mod.qh
qcsrc/menu/mutators/events.qc [new file with mode: 0644]
qcsrc/menu/xonotic/mainwindow.qc
qcsrc/server/bot/default/aim.qc
qcsrc/server/bot/default/bot.qc
qcsrc/server/cheats.qc
qcsrc/server/command/cmd.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/command/vote.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_damage.qh
qcsrc/server/g_world.qc
qcsrc/server/items.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/_mod.inc
qcsrc/server/mutators/_mod.qh
qcsrc/server/mutators/events.qc [new file with mode: 0644]
qcsrc/server/scores.qc
qcsrc/server/spawnpoints.qc
qcsrc/server/sv_main.qc
qcsrc/server/teamplay.qc
qcsrc/server/weapons/accuracy.qc
qcsrc/server/weapons/spawning.qc
qcsrc/server/weapons/throwing.qc
qcsrc/server/weapons/weaponsystem.qc

index 62b732b..bcbe724 100644 (file)
@@ -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>
index 8eea240..5a53be8 100644 (file)
@@ -14,7 +14,7 @@
 #include "../mapvoting.qh"
 #include "../miscfunctions.qh"
 
-#include "../mutators/events.qh"
+#include <client/mutators/_mod.qh>
 
 #include <common/mapinfo.qh>
 
index 6499a68..37e18bd 100644 (file)
@@ -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>
index 66ca077..1ea23ae 100644 (file)
@@ -2,4 +2,4 @@
 
 #include "hud.qh"
 #include "hud_config.qh"
-#include <client/mutators/events.qh>
+#include <client/mutators/_mod.qh>
index 22556e2..efb1fa2 100644 (file)
@@ -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"
index 220b9c6..bb1b6f9 100644 (file)
@@ -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"
 
index fa5a792..a1b53fb 100644 (file)
@@ -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>
index 089c7df..444fb27 100644 (file)
@@ -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>
index 2a1d587..68b43b1 100644 (file)
@@ -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
index 53b67c9..183302b 100644 (file)
@@ -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"
index e727b39..bd45230 100644 (file)
@@ -3,7 +3,7 @@
 #include "../menu.qh"
 #include "../item.qh"
 
-#include "../mutators/events.qh"
+#include <menu/mutators/_mod.qh>
 
 #include <common/command/_mod.qh>
 
index 98fb481..2698092 100644 (file)
@@ -1 +1,2 @@
 // generated file; do not modify
+#include <menu/mutators/events.qc>
index 98fb481..93432be 100644 (file)
@@ -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
@@ -0,0 +1 @@
+#include "events.qh"
index 0afd27c..110b796 100644 (file)
@@ -1,6 +1,6 @@
 #include "mainwindow.qh"
 
-#include "../mutators/events.qh"
+#include <menu/mutators/_mod.qh>
 
 #include "nexposee.qh"
 #include "inputbox.qh"
index 383ead1..3a9befd 100644 (file)
@@ -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,
index b4272e3..976d67e 100644 (file)
@@ -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"
 
index 9751c6c..f71cb49 100644 (file)
@@ -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"
 
index 2267c14..8111a64 100644 (file)
@@ -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
index 35b172e..0471cff 100644 (file)
@@ -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>
index 48cf949..5f034f1 100644 (file)
@@ -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>
index 21c0073..cefeb31 100644 (file)
@@ -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"
index 9c4983f..9ab8178 100644 (file)
@@ -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>
index 48bc63b..842f5b5 100644 (file)
@@ -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"
index 8a1768a..b21df78 100644 (file)
@@ -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>
 
index 25ba4b9..1a885f7 100644 (file)
@@ -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"
index df69ade..92707bf 100644 (file)
@@ -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>
index 582c285..7b7cdf3 100644 (file)
@@ -1,2 +1,3 @@
 // generated file; do not modify
+#include <server/mutators/events.qc>
 #include <server/mutators/loader.qc>
index 9ba0319..6adf8e0 100644 (file)
@@ -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
@@ -0,0 +1 @@
+#include "events.qh"
index 166c642..2cb40a8 100644 (file)
@@ -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"
index 6cfd45b..dcf6016 100644 (file)
@@ -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"
index 6d412ba..326c8d9 100644 (file)
@@ -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"
index a30e469..d9bab5d 100644 (file)
@@ -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>
index 1eda4e2..2d553ba 100644 (file)
@@ -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>
index 17f2dde..204b5a7 100644 (file)
@@ -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>
index dcf9ee4..462af14 100644 (file)
@@ -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>
index dd0e35b..9c62ec2 100644 (file)
@@ -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>