From 4181392df811a93dee6b97c303c3f7655f2f0a23 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 11 Jun 2018 14:45:51 +1000 Subject: [PATCH] Purge direct includes of mutators/events.qh in favour of the _mod files --- qcsrc/client/announcer.qc | 2 +- qcsrc/client/commands/cl_cmd.qc | 2 +- qcsrc/client/csqcmodel_hooks.qc | 2 +- qcsrc/client/hud/panel.qh | 2 +- qcsrc/client/main.qc | 2 +- qcsrc/client/player_skeleton.qc | 2 +- qcsrc/client/view.qc | 2 +- qcsrc/client/weapons/projectile.qc | 2 +- qcsrc/common/effects/qc/damageeffects.qh | 2 +- qcsrc/common/util.qc | 4 ++-- qcsrc/menu/command/menu_cmd.qc | 2 +- qcsrc/menu/mutators/_mod.inc | 1 + qcsrc/menu/mutators/_mod.qh | 1 + qcsrc/menu/mutators/events.qc | 1 + qcsrc/menu/xonotic/mainwindow.qc | 2 +- qcsrc/server/bot/default/aim.qc | 2 +- qcsrc/server/bot/default/bot.qc | 2 +- qcsrc/server/cheats.qc | 2 +- qcsrc/server/command/cmd.qc | 2 +- qcsrc/server/command/sv_cmd.qc | 2 +- qcsrc/server/command/vote.qc | 2 +- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/g_damage.qh | 2 +- qcsrc/server/g_world.qc | 2 +- qcsrc/server/items.qc | 2 +- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/miscfunctions.qh | 2 +- qcsrc/server/mutators/_mod.inc | 1 + qcsrc/server/mutators/_mod.qh | 1 + qcsrc/server/mutators/events.qc | 1 + qcsrc/server/scores.qc | 3 +-- qcsrc/server/spawnpoints.qc | 2 +- qcsrc/server/sv_main.qc | 2 +- qcsrc/server/teamplay.qc | 2 +- qcsrc/server/weapons/accuracy.qc | 2 +- qcsrc/server/weapons/spawning.qc | 2 +- qcsrc/server/weapons/throwing.qc | 2 +- qcsrc/server/weapons/weaponsystem.qc | 2 +- 38 files changed, 39 insertions(+), 34 deletions(-) create mode 100644 qcsrc/menu/mutators/events.qc create mode 100644 qcsrc/server/mutators/events.qc diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 62b732bec2..bcbe724469 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -1,6 +1,6 @@ #include "announcer.qh" -#include "mutators/events.qh" +#include #include #include diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 8eea240d40..5a53be8e79 100644 --- 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 #include diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 6499a683e8..37e18bd8e0 100644 --- 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 #include "player_skeleton.qh" #include "weapons/projectile.qh" #include diff --git a/qcsrc/client/hud/panel.qh b/qcsrc/client/hud/panel.qh index 66ca0772b6..1ea23ae2e7 100644 --- a/qcsrc/client/hud/panel.qh +++ b/qcsrc/client/hud/panel.qh @@ -2,4 +2,4 @@ #include "hud.qh" #include "hud_config.qh" -#include +#include diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 22556e2aec..efb1fa204e 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -9,7 +9,7 @@ #include #include "hud/_mod.qh" #include "mapvoting.qh" -#include "mutators/events.qh" +#include #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 220b9c6127..bb1b6f919b 100644 --- a/qcsrc/client/player_skeleton.qc +++ b/qcsrc/client/player_skeleton.qc @@ -2,7 +2,7 @@ #include #include -#include "mutators/events.qh" +#include #include "../lib/csqcmodel/cl_player.qh" #include "../lib/warpzone/anglestransform.qh" diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index fa5a79207e..a1b53fb82c 100644 --- 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 #include #include diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index 089c7df11f..444fb27431 100644 --- 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 #include #include diff --git a/qcsrc/common/effects/qc/damageeffects.qh b/qcsrc/common/effects/qc/damageeffects.qh index 2a1d587ca4..68b43b1760 100644 --- a/qcsrc/common/effects/qc/damageeffects.qh +++ b/qcsrc/common/effects/qc/damageeffects.qh @@ -3,7 +3,7 @@ #ifdef CSQC #include #include -#include +#include #include #include #endif diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 53b67c9035..183302b3a1 100644 --- 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 #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 #include "notifications/all.qh" #include #include "scores.qh" diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index e727b39e64..bd45230c97 100644 --- 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 #include diff --git a/qcsrc/menu/mutators/_mod.inc b/qcsrc/menu/mutators/_mod.inc index 98fb4815c1..2698092690 100644 --- a/qcsrc/menu/mutators/_mod.inc +++ b/qcsrc/menu/mutators/_mod.inc @@ -1 +1,2 @@ // generated file; do not modify +#include diff --git a/qcsrc/menu/mutators/_mod.qh b/qcsrc/menu/mutators/_mod.qh index 98fb4815c1..93432be42c 100644 --- a/qcsrc/menu/mutators/_mod.qh +++ b/qcsrc/menu/mutators/_mod.qh @@ -1 +1,2 @@ // generated file; do not modify +#include diff --git a/qcsrc/menu/mutators/events.qc b/qcsrc/menu/mutators/events.qc new file mode 100644 index 0000000000..c2dbb70215 --- /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 0afd27c8d6..110b796be6 100644 --- a/qcsrc/menu/xonotic/mainwindow.qc +++ b/qcsrc/menu/xonotic/mainwindow.qc @@ -1,6 +1,6 @@ #include "mainwindow.qh" -#include "../mutators/events.qh" +#include #include "nexposee.qh" #include "inputbox.qh" diff --git a/qcsrc/server/bot/default/aim.qc b/qcsrc/server/bot/default/aim.qc index 383ead1943..3a9befde40 100644 --- 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 // 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 b4272e3e06..976d67ec99 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -21,7 +21,7 @@ #include "../../race.qh" #include -#include "../../mutators/_mod.qh" +#include #include "../../weapons/accuracy.qh" diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 9751c6cf21..f71cb494b9 100644 --- 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 #include "weapons/tracing.qh" diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 2267c144a3..8111a64ef8 100644 --- 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 #include #ifdef SVQC diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 35b172e7fd..0471cff072 100644 --- 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 #include #include diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 48cf949d4e..5f034f12f8 100644 --- 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 #include #include diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 21c00738ff..cefeb316a1 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -3,7 +3,7 @@ #include #include "bot/api.qh" #include "g_hook.qh" -#include "mutators/_mod.qh" +#include #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 9c4983fee1..9ab817853b 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@ -19,7 +19,7 @@ #include "defs.qh" #include #include - #include "mutators/_mod.qh" + #include #include #include #include diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 48bc63bbc0..842f5b53c7 100644 --- 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 #include "race.qh" #include "scores.qh" #include "teamplay.qh" diff --git a/qcsrc/server/items.qc b/qcsrc/server/items.qc index 8a1768a8c5..b21df78e3f 100644 --- 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 #include #include diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 25ba4b9f54..1a885f78f0 100644 --- 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 #include "../common/t_items.qh" #include "resources.qh" #include "items.qh" diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index df69ade286..92707bf394 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -5,7 +5,7 @@ #include -#include "mutators/events.qh" +#include #include #include diff --git a/qcsrc/server/mutators/_mod.inc b/qcsrc/server/mutators/_mod.inc index 582c2852f3..7b7cdf33df 100644 --- a/qcsrc/server/mutators/_mod.inc +++ b/qcsrc/server/mutators/_mod.inc @@ -1,2 +1,3 @@ // generated file; do not modify +#include #include diff --git a/qcsrc/server/mutators/_mod.qh b/qcsrc/server/mutators/_mod.qh index 9ba0319fe4..6adf8e0db5 100644 --- a/qcsrc/server/mutators/_mod.qh +++ b/qcsrc/server/mutators/_mod.qh @@ -1,2 +1,3 @@ // generated file; do not modify +#include #include diff --git a/qcsrc/server/mutators/events.qc b/qcsrc/server/mutators/events.qc new file mode 100644 index 0000000000..c2dbb70215 --- /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 166c642559..2cb40a8349 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -4,8 +4,7 @@ #include "defs.qh" #include #include -//#include "mutators/_mod.qh" -#include "mutators/events.qh" +#include #include #include "../common/playerstats.qh" #include "../common/teams.qh" diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index 6cfd45b101..dcf6016c5e 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -1,6 +1,6 @@ #include "spawnpoints.qh" -#include "mutators/events.qh" +#include #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 6d412bacea..326c8d9609 100644 --- 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 #include "weapons/csqcprojectile.qh" #include "../common/constants.qh" diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index a30e4696dd..d9bab5d7f8 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -9,7 +9,7 @@ #include "command/vote.qh" -#include "mutators/_mod.qh" +#include #include "../common/deathtypes/all.qh" #include diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc index 1eda4e25b1..2d553ba168 100644 --- a/qcsrc/server/weapons/accuracy.qc +++ b/qcsrc/server/weapons/accuracy.qc @@ -1,6 +1,6 @@ #include "accuracy.qh" -#include "../mutators/_mod.qh" +#include #include #include #include diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 17f2ddeeee..204b5a7633 100644 --- 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 #include #include #include diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index dcf9ee41b3..462af14d8e 100644 --- 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 #include #include "../g_damage.qh" #include diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index dd0e35b955..9c62ec22e4 100644 --- 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 #include "../round_handler.qh" #include #include -- 2.39.2