From ee6a8c2bec6a4fced519300c85a07a55405c93f7 Mon Sep 17 00:00:00 2001 From: TimePath Date: Tue, 12 May 2015 17:58:00 +1000 Subject: [PATCH] Light refactoring: rename module roots to `all` for consistency --- qcsrc/client/_all.qh | 4 ++-- qcsrc/client/command/{commands.qc => all.qc} | 2 +- qcsrc/client/command/all.qh | 8 ++++++++ qcsrc/client/command/commands.qh | 8 -------- qcsrc/client/damage.qc | 4 ++-- qcsrc/client/hud.qh | 2 +- qcsrc/client/main.qc | 6 +++--- qcsrc/client/progs.src | 8 ++++---- qcsrc/client/t_items.qc | 2 +- qcsrc/client/vehicles/{vehicles.qc => all.qc} | 2 +- qcsrc/client/vehicles/{vehicles.qh => all.qh} | 4 ++-- qcsrc/client/view.qc | 4 ++-- qcsrc/client/waypointsprites.qc | 2 +- qcsrc/common/command/{commands.qc => all.qc} | 0 qcsrc/common/command/{commands.qh => all.qh} | 4 ++-- qcsrc/common/mapinfo.qc | 4 ++-- qcsrc/common/monsters/{monsters.qc => all.qc} | 2 +- qcsrc/common/monsters/{monsters.qh => all.qh} | 4 ++-- qcsrc/common/monsters/spawn.qc | 2 +- qcsrc/common/monsters/sv_monsters.qc | 4 ++-- qcsrc/common/playerstats.qc | 2 +- qcsrc/common/weapons/{weapons.qc => all.qc} | 8 ++++---- qcsrc/common/weapons/{weapons.qh => all.qh} | 4 ++-- qcsrc/common/weapons/config.qc | 2 +- qcsrc/menu/_all.qh | 4 ++-- qcsrc/menu/command/{commands.qc => all.qc} | 2 +- qcsrc/menu/command/{commands.qh => all.qh} | 4 ++-- qcsrc/menu/menu.qc | 2 +- qcsrc/menu/progs.src | 6 +++--- qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc | 2 +- qcsrc/server/_all.qh | 4 ++-- qcsrc/server/bot/bot.qc | 2 +- qcsrc/server/cheats.qc | 4 ++-- qcsrc/server/cl_impulse.qc | 2 +- qcsrc/server/cl_physics.qc | 2 +- qcsrc/server/command/{commands.qc => all.qc} | 2 +- qcsrc/server/command/{commands.qh => all.qh} | 4 ++-- qcsrc/server/command/cmd.qc | 2 +- qcsrc/server/command/getreplies.qc | 2 +- qcsrc/server/defs.qh | 2 +- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/g_damage.qh | 2 +- qcsrc/server/g_hook.qc | 2 +- qcsrc/server/g_world.qc | 4 ++-- qcsrc/server/item_key.qc | 2 +- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/mutators/gamemode.qh | 2 +- qcsrc/server/mutators/mutator.qh | 2 +- qcsrc/server/mutators/mutators_include.qc | 4 ++-- qcsrc/server/portals.qc | 2 +- qcsrc/server/progs.src | 6 +++--- qcsrc/server/sv_main.qc | 2 +- qcsrc/server/t_items.qc | 4 ++-- qcsrc/server/t_plats.qc | 2 +- qcsrc/server/t_quake.qc | 2 +- qcsrc/server/t_quake3.qc | 2 +- qcsrc/server/t_swamp.qc | 2 +- qcsrc/server/vehicles/all.qh | 4 ++-- qcsrc/server/weapons/accuracy.qc | 2 +- qcsrc/server/weapons/common.qc | 2 +- qcsrc/server/weapons/csqcprojectile.qc | 2 +- qcsrc/server/weapons/hitplot.qc | 2 +- qcsrc/server/weapons/selection.qc | 2 +- qcsrc/server/weapons/spawning.qc | 2 +- qcsrc/server/weapons/throwing.qc | 2 +- qcsrc/server/weapons/tracing.qc | 2 +- qcsrc/server/weapons/weaponstats.qc | 2 +- qcsrc/server/weapons/weaponsystem.qc | 4 ++-- qcsrc/warpzonelib/common.qc | 2 +- 69 files changed, 105 insertions(+), 105 deletions(-) rename qcsrc/client/command/{commands.qc => all.qc} (50%) create mode 100644 qcsrc/client/command/all.qh delete mode 100644 qcsrc/client/command/commands.qh rename qcsrc/client/vehicles/{vehicles.qc => all.qc} (99%) rename qcsrc/client/vehicles/{vehicles.qh => all.qh} (87%) rename qcsrc/common/command/{commands.qc => all.qc} (100%) rename qcsrc/common/command/{commands.qh => all.qh} (53%) rename qcsrc/common/monsters/{monsters.qc => all.qc} (98%) rename qcsrc/common/monsters/{monsters.qh => all.qh} (98%) rename qcsrc/common/weapons/{weapons.qc => all.qc} (98%) rename qcsrc/common/weapons/{weapons.qh => all.qh} (99%) rename qcsrc/menu/command/{commands.qc => all.qc} (51%) rename qcsrc/menu/command/{commands.qh => all.qh} (57%) rename qcsrc/server/command/{commands.qc => all.qc} (77%) rename qcsrc/server/command/{commands.qh => all.qh} (77%) diff --git a/qcsrc/client/_all.qh b/qcsrc/client/_all.qh index c8ff79d58b..e758fdb7a7 100644 --- a/qcsrc/client/_all.qh +++ b/qcsrc/client/_all.qh @@ -1,5 +1,5 @@ -#ifndef CLIENT___H -#define CLIENT___H +#ifndef CLIENT_ALL_H +#define CLIENT_ALL_H #include "autocvars.qh" #include "defs.qh" diff --git a/qcsrc/client/command/commands.qc b/qcsrc/client/command/all.qc similarity index 50% rename from qcsrc/client/command/commands.qc rename to qcsrc/client/command/all.qc index dabf8f35ad..dcace65938 100644 --- a/qcsrc/client/command/commands.qc +++ b/qcsrc/client/command/all.qc @@ -1,5 +1,5 @@ #include "../_all.qh" -#include "../../common/command/commands.qc" +#include "../../common/command/all.qc" #include "cl_cmd.qc" diff --git a/qcsrc/client/command/all.qh b/qcsrc/client/command/all.qh new file mode 100644 index 0000000000..34fc423a40 --- /dev/null +++ b/qcsrc/client/command/all.qh @@ -0,0 +1,8 @@ +#ifndef CLIENT_COMMANDS_ALL_H +#define CLIENT_COMMANDS_ALL_H + +#include "../../common/command/all.qh" + +#include "cl_cmd.qh" + +#endif diff --git a/qcsrc/client/command/commands.qh b/qcsrc/client/command/commands.qh deleted file mode 100644 index 65bf3dab93..0000000000 --- a/qcsrc/client/command/commands.qh +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef CLIENT_COMMANDS_H -#define CLIENT_COMMANDS_H - -#include "../../common/command/commands.qh" - -#include "cl_cmd.qh" - -#endif diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc index 9241621382..39c422e1cc 100644 --- a/qcsrc/client/damage.qc +++ b/qcsrc/client/damage.qc @@ -5,13 +5,13 @@ #include "movetypes.qh" #include "prandom.qh" -#include "vehicles/vehicles.qh" +#include "vehicles/all.qh" #include "../common/constants.qh" #include "../common/deathtypes.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" .entity tag_entity; diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index f880a810f6..4e12dc56b2 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -1,7 +1,7 @@ #ifndef HUD_H #define HUD_H -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" const int HUD_PANEL_MAX = 24; entity hud_panel[HUD_PANEL_MAX]; diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 5343c180cc..298bcdbefe 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -25,21 +25,21 @@ #include "waypointsprites.qh" #include "vehicles/bumblebee.qh" -#include "vehicles/vehicles.qh" +#include "vehicles/all.qh" #include "weapons/projectile.qh" #include "../common/buffs.qh" #include "../common/deathtypes.qh" #include "../common/mapinfo.qh" -#include "../common/monsters/monsters.qh" +#include "../common/monsters/all.qh" #include "../common/nades.qh" #include "../common/net_notice.qh" #include "../common/notifications.qh" #include "../common/stats.qh" #include "../common/teams.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/cl_model.qh" #include "../csqcmodellib/interpolate.qh" diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src index 36d159c75e..843ae12a47 100644 --- a/qcsrc/client/progs.src +++ b/qcsrc/client/progs.src @@ -37,10 +37,10 @@ view.qc wall.qc waypointsprites.qc -command/commands.qc +command/all.qc vehicles/bumblebee.qc -vehicles/vehicles.qc +vehicles/all.qc weapons/projectile.qc // TODO @@ -55,9 +55,9 @@ weapons/projectile.qc // TODO ../common/urllib.qc ../common/util.qc -../common/monsters/monsters.qc +../common/monsters/all.qc -../common/weapons/weapons.qc // TODO +../common/weapons/all.qc // TODO ../csqcmodellib/cl_model.qc ../csqcmodellib/cl_player.qc diff --git a/qcsrc/client/t_items.qc b/qcsrc/client/t_items.qc index f9ebb97866..ca631fcbd5 100644 --- a/qcsrc/client/t_items.qc +++ b/qcsrc/client/t_items.qc @@ -3,7 +3,7 @@ #include "movetypes.qh" #include "../common/buffs.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/cl_model.qh" #include "../csqcmodellib/common.qh" diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/all.qc similarity index 99% rename from qcsrc/client/vehicles/vehicles.qc rename to qcsrc/client/vehicles/all.qc index 1582ecfcb8..0af4d4b967 100644 --- a/qcsrc/client/vehicles/vehicles.qc +++ b/qcsrc/client/vehicles/all.qc @@ -1,4 +1,4 @@ -#include "vehicles.qh" +#include "all.qh" #include "../_all.qh" #include "../movetypes.qh" diff --git a/qcsrc/client/vehicles/vehicles.qh b/qcsrc/client/vehicles/all.qh similarity index 87% rename from qcsrc/client/vehicles/vehicles.qh rename to qcsrc/client/vehicles/all.qh index e8d3ddb4f7..f92ab82b3d 100644 --- a/qcsrc/client/vehicles/vehicles.qh +++ b/qcsrc/client/vehicles/all.qh @@ -1,5 +1,5 @@ -#ifndef VEHICLES_H -#define VEHICLES_H +#ifndef VEHICLES_ALL_H +#define VEHICLES_ALL_H void RaptorCBShellfragDraw(); void RaptorCBShellfragToss(vector _org, vector _vel, vector _ang); diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 3ffb4066c5..d3bcf92447 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -9,7 +9,7 @@ #include "scoreboard.qh" #include "shownames.qh" #include "target_music.qh" -#include "vehicles/vehicles.qh" +#include "vehicles/all.qh" #include "waypointsprites.qh" #include "../common/constants.qh" @@ -19,7 +19,7 @@ #include "../common/teams.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/cl_player.qh" diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc index dc38219b51..aed0865dda 100644 --- a/qcsrc/client/waypointsprites.qc +++ b/qcsrc/client/waypointsprites.qc @@ -8,7 +8,7 @@ #include "../common/constants.qh" #include "../common/teams.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/interpolate.qh" diff --git a/qcsrc/common/command/commands.qc b/qcsrc/common/command/all.qc similarity index 100% rename from qcsrc/common/command/commands.qc rename to qcsrc/common/command/all.qc diff --git a/qcsrc/common/command/commands.qh b/qcsrc/common/command/all.qh similarity index 53% rename from qcsrc/common/command/commands.qh rename to qcsrc/common/command/all.qh index d434a86555..7eeb5c3233 100644 --- a/qcsrc/common/command/commands.qh +++ b/qcsrc/common/command/all.qh @@ -1,5 +1,5 @@ -#ifndef COMMON_COMMANDS_H -#define COMMON_COMMANDS_H +#ifndef COMMON_COMMANDS_ALL_H +#define COMMON_COMMANDS_ALL_H #include "generic.qh" #include "markup.qh" diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index c3f15d1937..2e692d7268 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -3,7 +3,7 @@ #include "../client/defs.qh" #include "util.qh" #include "buffs.qh" - #include "weapons/weapons.qh" + #include "weapons/all.qh" #include "mapinfo.qh" #elif defined(MENUQC) #elif defined(SVQC) @@ -11,7 +11,7 @@ #include "../dpdefs/dpextensions.qh" #include "util.qh" #include "buffs.qh" - #include "monsters/monsters.qh" + #include "monsters/all.qh" #include "mapinfo.qh" #endif diff --git a/qcsrc/common/monsters/monsters.qc b/qcsrc/common/monsters/all.qc similarity index 98% rename from qcsrc/common/monsters/monsters.qc rename to qcsrc/common/monsters/all.qc index 72c5ea870d..37dbcb3258 100644 --- a/qcsrc/common/monsters/monsters.qc +++ b/qcsrc/common/monsters/all.qc @@ -1,4 +1,4 @@ -#include "monsters.qh" +#include "all.qh" #include "all.inc" diff --git a/qcsrc/common/monsters/monsters.qh b/qcsrc/common/monsters/all.qh similarity index 98% rename from qcsrc/common/monsters/monsters.qh rename to qcsrc/common/monsters/all.qh index 4aa1f7ef4c..ce02312f1d 100644 --- a/qcsrc/common/monsters/monsters.qh +++ b/qcsrc/common/monsters/all.qh @@ -1,5 +1,5 @@ -#ifndef MONSTERS_H -#define MONSTERS_H +#ifndef MONSTERS_ALL_H +#define MONSTERS_ALL_H #include "../util.qh" diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc index 8aee54b980..5bfef1b8f5 100644 --- a/qcsrc/common/monsters/spawn.qc +++ b/qcsrc/common/monsters/spawn.qc @@ -3,7 +3,7 @@ #elif defined(SVQC) #include "../../dpdefs/progsdefs.qh" #include "../util.qh" - #include "monsters.qh" + #include "all.qh" #include "sv_monsters.qh" #include "spawn.qh" #include "../../server/autocvars.qh" diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index 3ff926bf61..ce254751bd 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -7,9 +7,9 @@ #include "../constants.qh" #include "../teams.qh" #include "../util.qh" - #include "monsters.qh" + #include "all.qh" #include "sv_monsters.qh" - #include "../weapons/weapons.qh" + #include "../weapons/all.qh" #include "../../server/autocvars.qh" #include "../../server/defs.qh" #include "../deathtypes.qh" diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index 5890fb89e1..e46e12fa1e 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -6,7 +6,7 @@ #include "constants.qh" #include "util.qh" #include "urllib.qh" - #include "weapons/weapons.qh" + #include "weapons/all.qh" #include "../server/weapons/accuracy.qh" #include "../server/defs.qh" #include "playerstats.qh" diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/all.qc similarity index 98% rename from qcsrc/common/weapons/weapons.qc rename to qcsrc/common/weapons/all.qc index 58fdbaed44..847c8371d6 100644 --- a/qcsrc/common/weapons/weapons.qc +++ b/qcsrc/common/weapons/all.qc @@ -1,7 +1,7 @@ -#ifndef WEAPONS_C -#define WEAPONS_C +#ifndef WEAPONS_ALL_C +#define WEAPONS_ALL_C -#include "weapons.qh" +#include "all.qh" #if defined(CSQC) #include "../../dpdefs/csprogsdefs.qh" @@ -34,7 +34,7 @@ #include "../teams.qh" #include "../util.qh" #include "../buffs.qh" - #include "../monsters/monsters.qh" + #include "../monsters/all.qh" #include "config.qh" #include "../../server/weapons/csqcprojectile.qh" #include "../../server/weapons/tracing.qh" diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/all.qh similarity index 99% rename from qcsrc/common/weapons/weapons.qh rename to qcsrc/common/weapons/all.qh index 5f17ccb8f1..154f8167e9 100644 --- a/qcsrc/common/weapons/weapons.qh +++ b/qcsrc/common/weapons/all.qh @@ -1,5 +1,5 @@ -#ifndef WEAPONS_H -#define WEAPONS_H +#ifndef WEAPONS_ALL_H +#define WEAPONS_ALL_H #ifndef MENUQC #include "calculations.qh" diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc index a314f036b3..0448f4874a 100644 --- a/qcsrc/common/weapons/config.qc +++ b/qcsrc/common/weapons/config.qc @@ -5,7 +5,7 @@ #include "../../dpdefs/dpextensions.qh" #include "../util.qh" #include "config.qh" - #include "weapons.qh" + #include "all.qh" #endif // ========================== diff --git a/qcsrc/menu/_all.qh b/qcsrc/menu/_all.qh index cc07017e12..a6903ae3dc 100644 --- a/qcsrc/menu/_all.qh +++ b/qcsrc/menu/_all.qh @@ -1,5 +1,5 @@ -#ifndef CLIENT___H -#define CLIENT___H +#ifndef CLIENT_ALL_H +#define CLIENT_ALL_H #include "../dpdefs/menudefs.qh" #include "../dpdefs/keycodes.qh" diff --git a/qcsrc/menu/command/commands.qc b/qcsrc/menu/command/all.qc similarity index 51% rename from qcsrc/menu/command/commands.qc rename to qcsrc/menu/command/all.qc index 5b5911fa90..711a747ea9 100644 --- a/qcsrc/menu/command/commands.qc +++ b/qcsrc/menu/command/all.qc @@ -1,5 +1,5 @@ #include "../menu.qh" -#include "../../common/command/commands.qc" +#include "../../common/command/all.qc" #include "menu_cmd.qc" diff --git a/qcsrc/menu/command/commands.qh b/qcsrc/menu/command/all.qh similarity index 57% rename from qcsrc/menu/command/commands.qh rename to qcsrc/menu/command/all.qh index 5ea300616b..7f116ae9f1 100644 --- a/qcsrc/menu/command/commands.qh +++ b/qcsrc/menu/command/all.qh @@ -1,5 +1,5 @@ -#ifndef MENU_COMMANDS_H -#define MENU_COMMANDS_H +#ifndef MENU_COMMANDS_ALL_H +#define MENU_COMMANDS_ALL_H #include "../../common/command/commands.qh" diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index 669e08fe72..70f4249d03 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -2,7 +2,7 @@ #include "oo/classes.qc" #include "xonotic/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../common/mapinfo.qh" /////////////////////////////////////////////// diff --git a/qcsrc/menu/progs.src b/qcsrc/menu/progs.src index abfb303dbc..636c862b7d 100644 --- a/qcsrc/menu/progs.src +++ b/qcsrc/menu/progs.src @@ -9,7 +9,7 @@ oo/classes.qc draw.qc menu.qc -command/commands.qc +command/all.qc xonotic/util.qc @@ -21,8 +21,8 @@ xonotic/util.qc ../common/urllib.qc ../common/util.qc -../common/monsters/monsters.qc +../common/monsters/all.qc -../common/weapons/weapons.qc // TODO +../common/weapons/all.qc // TODO ../warpzonelib/mathlib.qc diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc index 4494452256..8ab5296383 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc @@ -1,4 +1,4 @@ -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" #ifndef DIALOG_MULTIPLAYER_CREATE_MUTATORS_H #define DIALOG_MULTIPLAYER_CREATE_MUTATORS_H diff --git a/qcsrc/server/_all.qh b/qcsrc/server/_all.qh index 6438a1094a..a331362151 100644 --- a/qcsrc/server/_all.qh +++ b/qcsrc/server/_all.qh @@ -1,5 +1,5 @@ -#ifndef SERVER___H -#define SERVER___H +#ifndef SERVER_ALL_H +#define SERVER_ALL_H #include "autocvars.qh" #include "constants.qh" diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc index 1879b18604..e42a50f6d4 100644 --- a/qcsrc/server/bot/bot.qc +++ b/qcsrc/server/bot/bot.qc @@ -27,7 +27,7 @@ #include "../../common/teams.qh" #include "../../common/util.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" #include "../../csqcmodellib/sv_model.qh" diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 75a93d267d..d9eb759150 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -13,9 +13,9 @@ #include "../common/deathtypes.qh" #include "../common/util.qh" -#include "../common/monsters/monsters.qh" +#include "../common/monsters/all.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/sv_model.qh" diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc index a02cf40aca..bb4c171c87 100644 --- a/qcsrc/server/cl_impulse.qc +++ b/qcsrc/server/cl_impulse.qc @@ -13,7 +13,7 @@ #include "vehicles/vehicle.qh" #include "waypointsprites.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" /* * Impulse map: diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc index bbb730d310..67c57ae16d 100644 --- a/qcsrc/server/cl_physics.qc +++ b/qcsrc/server/cl_physics.qc @@ -13,7 +13,7 @@ #include "../common/util.qh" #include "../common/animdecide.qh" #include "../common/monsters/sv_monsters.qh" - #include "../common/weapons/weapons.qh" + #include "../common/weapons/all.qh" #include "t_items.qh" #include "autocvars.qh" #include "defs.qh" diff --git a/qcsrc/server/command/commands.qc b/qcsrc/server/command/all.qc similarity index 77% rename from qcsrc/server/command/commands.qc rename to qcsrc/server/command/all.qc index 1db4db181b..ac37b6b2ce 100644 --- a/qcsrc/server/command/commands.qc +++ b/qcsrc/server/command/all.qc @@ -1,4 +1,4 @@ -#include "../../common/command/commands.qc" +#include "../../common/command/all.qc" #include "sv_cmd.qc" diff --git a/qcsrc/server/command/commands.qh b/qcsrc/server/command/all.qh similarity index 77% rename from qcsrc/server/command/commands.qh rename to qcsrc/server/command/all.qh index d26468da2e..af87c24b1a 100644 --- a/qcsrc/server/command/commands.qh +++ b/qcsrc/server/command/all.qh @@ -1,5 +1,5 @@ -#ifndef SERVER_COMMANDS_H -#define SERVER_COMMANDS_H +#ifndef SERVER_COMMANDS_ALL_H +#define SERVER_COMMANDS_ALL_H #include "../../common/command/commands.qh" diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index d9eeea19eb..4548bbf9bb 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -27,7 +27,7 @@ #include "../../common/teams.qh" #include "../../common/util.qh" -#include "../../common/monsters/monsters.qh" +#include "../../common/monsters/all.qh" #include "../../common/monsters/spawn.qh" #include "../../common/monsters/sv_monsters.qh" diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc index 12a31ca653..543f1db152 100644 --- a/qcsrc/server/command/getreplies.qc +++ b/qcsrc/server/command/getreplies.qc @@ -9,7 +9,7 @@ #include "../../common/mapinfo.qh" #include "../../common/util.qh" -#include "../../common/monsters/monsters.qh" +#include "../../common/monsters/all.qh" // ========================================================= // Reply messages for common commands, re-worked by Samual diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 49e340c497..2ac72548ee 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -1,7 +1,7 @@ #ifndef SERVER_DEFS_H #define SERVER_DEFS_H -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #define INDEPENDENT_ATTACK_FINISHED diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 1e7e72a125..24bce642d8 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -18,7 +18,7 @@ #include "../common/playerstats.qh" #include "../common/teams.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/sv_model.qh" #include "../warpzonelib/common.qh" diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh index 49f495bc4a..9dce060cc4 100644 --- a/qcsrc/server/g_damage.qh +++ b/qcsrc/server/g_damage.qh @@ -10,7 +10,7 @@ #include "../common/constants.qh" #include "../common/teams.qh" #include "../common/util.qh" - #include "../common/weapons/weapons.qh" + #include "../common/weapons/all.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index c101236f89..4a3f3101ac 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -12,7 +12,7 @@ #include "vehicles/vehicle.qh" #include "../common/constants.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../warpzonelib/common.qh" #include "../warpzonelib/server.qh" diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 82a81776a3..d9b3e3faf4 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -25,14 +25,14 @@ #include "../common/constants.qh" #include "../common/deathtypes.qh" #include "../common/mapinfo.qh" -#include "../common/monsters/monsters.qh" +#include "../common/monsters/all.qh" #include "../common/monsters/sv_monsters.qh" #include "../common/notifications.qh" #include "../common/playerstats.qh" #include "../common/stats.qh" #include "../common/teams.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" const float LATENCY_THINKRATE = 10; .float latency_sum; diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc index e0f79f1144..1aa054d07e 100644 --- a/qcsrc/server/item_key.qc +++ b/qcsrc/server/item_key.qc @@ -1,7 +1,7 @@ #include "item_key.qh" #include "_all.qh" -#include "../common/monsters/monsters.qh" +#include "../common/monsters/all.qh" #include "../common/notifications.qh" #include "../common/util.qh" #include "../warpzonelib/util_server.qh" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 41f388ed53..079df60f81 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -21,7 +21,7 @@ #include "../common/teams.qh" #include "../common/urllib.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/sv_model.qh" #include "../warpzonelib/anglestransform.qh" #include "../warpzonelib/server.qh" diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh index 38e9ad8a3b..101bdece81 100644 --- a/qcsrc/server/mutators/gamemode.qh +++ b/qcsrc/server/mutators/gamemode.qh @@ -25,7 +25,7 @@ #include "../command/vote.qh" -#include "../../common/monsters/monsters.qh" +#include "../../common/monsters/all.qh" #include "../command/common.qh" diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh index 6cded53660..d7474fab45 100644 --- a/qcsrc/server/mutators/mutator.qh +++ b/qcsrc/server/mutators/mutator.qh @@ -37,7 +37,7 @@ #include "../../common/stats.qh" #include "../../common/teams.qh" -#include "../../common/monsters/monsters.qh" +#include "../../common/monsters/all.qh" #include "../../warpzonelib/anglestransform.qh" #include "../../warpzonelib/mathlib.qh" diff --git a/qcsrc/server/mutators/mutators_include.qc b/qcsrc/server/mutators/mutators_include.qc index 4c591446b7..4debaa5a88 100644 --- a/qcsrc/server/mutators/mutators_include.qc +++ b/qcsrc/server/mutators/mutators_include.qc @@ -23,11 +23,11 @@ #include "../../common/command/command.qh" #include "../../common/net_notice.qh" #include "../../common/animdecide.qh" - #include "../../common/monsters/monsters.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/weapons.qh" + #include "../../common/weapons/all.qh" #include "../weapons/accuracy.qh" #include "../weapons/common.qh" #include "../weapons/csqcprojectile.qh" diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index b9d32e106d..cb671ddc70 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -9,7 +9,7 @@ #include "../common/deathtypes.qh" #include "../common/notifications.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/sv_model.qh" #include "../warpzonelib/anglestransform.qh" #include "../warpzonelib/util_server.qh" diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src index 20b28a410d..a812de46a4 100644 --- a/qcsrc/server/progs.src +++ b/qcsrc/server/progs.src @@ -67,7 +67,7 @@ bot/havocbot/role_keyhunt.qc bot/havocbot/role_onslaught.qc bot/havocbot/roles.qc -command/commands.qc +command/all.qc mutators/mutators_include.qc mutators/mutators.qc @@ -97,7 +97,7 @@ weapons/weaponsystem.qc ../common/campaign_file.qc ../common/campaign_setup.qc ../common/mapinfo.qc -../common/monsters/monsters.qc +../common/monsters/all.qc ../common/monsters/spawn.qc ../common/monsters/sv_monsters.qc ../common/nades.qc @@ -108,7 +108,7 @@ weapons/weaponsystem.qc ../common/urllib.qc ../common/util.qc ../common/weapons/config.qc -../common/weapons/weapons.qc // TODO +../common/weapons/all.qc // TODO ../csqcmodellib/sv_model.qc diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index 5982d20284..0f7d1763b0 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -18,7 +18,7 @@ #include "../common/mapinfo.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/sv_model.qh" diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 6839091f4a..515677bfa7 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -20,9 +20,9 @@ #include "../common/notifications.qh" #include "../common/util.qh" - #include "../common/monsters/monsters.qh" + #include "../common/monsters/all.qh" - #include "../common/weapons/weapons.qh" + #include "../common/weapons/all.qh" #include "../warpzonelib/util_server.qh" #endif diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc index cec1a7f6bc..40d6a4d436 100644 --- a/qcsrc/server/t_plats.qc +++ b/qcsrc/server/t_plats.qc @@ -13,7 +13,7 @@ #include "../common/notifications.qh" #include "../common/util.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../csqcmodellib/sv_model.qh" diff --git a/qcsrc/server/t_quake.qc b/qcsrc/server/t_quake.qc index 9e68ac8124..517b880822 100644 --- a/qcsrc/server/t_quake.qc +++ b/qcsrc/server/t_quake.qc @@ -1,6 +1,6 @@ #include "_all.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" void spawnfunc_weapon_electro(); void spawnfunc_weapon_hagar(); diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc index 2c5bd894ea..6908b6dbf1 100644 --- a/qcsrc/server/t_quake3.qc +++ b/qcsrc/server/t_quake3.qc @@ -1,6 +1,6 @@ #include "_all.qh" -#include "../common/weapons/weapons.qh" +#include "../common/weapons/all.qh" #include "../common/buffs.qh" void spawnfunc_weapon_crylink(); diff --git a/qcsrc/server/t_swamp.qc b/qcsrc/server/t_swamp.qc index 1c80c3ac04..20b49ec6ae 100644 --- a/qcsrc/server/t_swamp.qc +++ b/qcsrc/server/t_swamp.qc @@ -4,7 +4,7 @@ #include "_all.qh" #include "../warpzonelib/util_server.qh" - #include "../common/weapons/weapons.qh" + #include "../common/weapons/all.qh" #include "../common/deathtypes.qh" #endif diff --git a/qcsrc/server/vehicles/all.qh b/qcsrc/server/vehicles/all.qh index c675c9cbfd..5203062234 100644 --- a/qcsrc/server/vehicles/all.qh +++ b/qcsrc/server/vehicles/all.qh @@ -1,5 +1,5 @@ -#ifndef VEHICLES_H -#define VEHICLES_H +#ifndef VEHICLES_ALL_H +#define VEHICLES_ALL_H #if VEHICLES_ENABLED # include "racer.qh" diff --git a/qcsrc/server/weapons/accuracy.qc b/qcsrc/server/weapons/accuracy.qc index bfa18464f0..1ef81a409e 100644 --- a/qcsrc/server/weapons/accuracy.qc +++ b/qcsrc/server/weapons/accuracy.qc @@ -5,7 +5,7 @@ #include "../../common/constants.qh" #include "../../common/teams.qh" #include "../../common/util.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" float accuracy_byte(float n, float d) { diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc index a837b2e47f..cf49b54f8b 100644 --- a/qcsrc/server/weapons/common.qc +++ b/qcsrc/server/weapons/common.qc @@ -6,7 +6,7 @@ #include "../../common/deathtypes.qh" #include "../../common/notifications.qh" #include "../../common/util.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" void W_GiveWeapon (entity e, float wep) { diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc index fef16a833b..507fc4a413 100644 --- a/qcsrc/server/weapons/csqcprojectile.qc +++ b/qcsrc/server/weapons/csqcprojectile.qc @@ -6,7 +6,7 @@ #include "../command/common.qh" #include "../../common/constants.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" .float csqcprojectile_type; diff --git a/qcsrc/server/weapons/hitplot.qc b/qcsrc/server/weapons/hitplot.qc index c93b319530..76e159738f 100644 --- a/qcsrc/server/weapons/hitplot.qc +++ b/qcsrc/server/weapons/hitplot.qc @@ -3,7 +3,7 @@ #include "../antilag.qh" #include "../g_subs.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" vector W_HitPlotUnnormalizedUntransform(vector screenforward, vector screenright, vector screenup, vector v) { diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc index da9b00a184..89c4253a13 100644 --- a/qcsrc/server/weapons/selection.qc +++ b/qcsrc/server/weapons/selection.qc @@ -6,7 +6,7 @@ #include "../waypointsprites.qh" #include "../../common/constants.qh" #include "../../common/util.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" // switch between weapons void Send_WeaponComplain(entity e, float wpn, float type) diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 9d46475af5..9096b2f9c7 100644 --- a/qcsrc/server/weapons/spawning.qc +++ b/qcsrc/server/weapons/spawning.qc @@ -4,7 +4,7 @@ #include "weaponsystem.qh" #include "../mutators/mutators_include.qh" #include "../t_items.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" string W_Apply_Weaponreplace(string in) { diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 6b549993ab..1fea5fb393 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -9,7 +9,7 @@ #include "../../common/mapinfo.qh" #include "../../common/notifications.qh" #include "../../common/util.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" void thrown_wep_think() { diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index 2a3181d1b2..0bdecfd0df 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -12,7 +12,7 @@ #include "../../common/constants.qh" #include "../../common/util.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" #include "../../warpzonelib/common.qh" diff --git a/qcsrc/server/weapons/weaponstats.qc b/qcsrc/server/weapons/weaponstats.qc index fb668ae7c5..a84969904a 100644 --- a/qcsrc/server/weapons/weaponstats.qc +++ b/qcsrc/server/weapons/weaponstats.qc @@ -4,7 +4,7 @@ #include "../g_world.qh" #include "../../common/urllib.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" void WeaponStats_Init() { diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc index accf5b2f0f..588c68acff 100644 --- a/qcsrc/server/weapons/weaponsystem.qc +++ b/qcsrc/server/weapons/weaponsystem.qc @@ -9,10 +9,10 @@ #include "../t_items.qh" #include "../../common/animdecide.qh" #include "../../common/constants.qh" -#include "../../common/monsters/monsters.qh" +#include "../../common/monsters/all.qh" #include "../../common/notifications.qh" #include "../../common/util.qh" -#include "../../common/weapons/weapons.qh" +#include "../../common/weapons/all.qh" #include "../../csqcmodellib/sv_model.qh" /* diff --git a/qcsrc/warpzonelib/common.qc b/qcsrc/warpzonelib/common.qc index 0734811c18..028724afba 100644 --- a/qcsrc/warpzonelib/common.qc +++ b/qcsrc/warpzonelib/common.qc @@ -5,7 +5,7 @@ #include "../server/t_items.qh" #elif defined(MENUQC) #elif defined(SVQC) - #include "../common/weapons/weapons.qh" + #include "../common/weapons/all.qh" #include "../dpdefs/dpextensions.qh" #include "../dpdefs/progsdefs.qh" #endif -- 2.39.5