From c3df3269846f4e7c86b5e3058d83df08767854a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Amadeusz=20S=C5=82awi=C5=84ski?= Date: Wed, 14 Oct 2020 20:44:07 +0000 Subject: [PATCH] Cleanup common includes Instead of: #include "../common/(...)" use: #include --- qcsrc/client/player_skeleton.qc | 4 ++-- qcsrc/client/teamradar.qc | 2 +- qcsrc/menu/draw.qc | 4 ++-- qcsrc/menu/menu.qc | 6 +++--- qcsrc/server/campaign.qc | 2 +- qcsrc/server/cheats.qc | 20 ++++++++--------- qcsrc/server/client.qc | 38 ++++++++++++++++----------------- qcsrc/server/damage.qc | 32 +++++++++++++-------------- qcsrc/server/hook.qc | 14 ++++++------ qcsrc/server/impulse.qc | 6 +++--- qcsrc/server/ipban.qc | 4 ++-- qcsrc/server/main.qc | 18 ++++++++-------- qcsrc/server/mapvoting.qc | 8 +++---- qcsrc/server/player.qc | 32 +++++++++++++-------------- qcsrc/server/portals.qc | 24 ++++++++++----------- qcsrc/server/race.qc | 12 +++++------ qcsrc/server/round_handler.qc | 2 +- qcsrc/server/scores.qc | 4 ++-- qcsrc/server/spawnpoints.qc | 14 ++++++------ qcsrc/server/teamplay.qc | 4 ++-- qcsrc/server/world.qc | 34 ++++++++++++++--------------- 21 files changed, 142 insertions(+), 142 deletions(-) diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc index d9c9ab142..ef2b6c4cb 100644 --- a/qcsrc/client/player_skeleton.qc +++ b/qcsrc/client/player_skeleton.qc @@ -3,8 +3,8 @@ #include #include #include -#include "../lib/csqcmodel/cl_player.qh" -#include "../lib/warpzone/anglestransform.qh" +#include +#include .float v_angle_save_x; diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 2e6ddba22..e67213e3b 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -6,7 +6,7 @@ #include -#include "../lib/csqcmodel/interpolate.qh" +#include vector teamradar_3dcoord_to_texcoord(vector in) { diff --git a/qcsrc/menu/draw.qc b/qcsrc/menu/draw.qc index ae6967e36..0b29572be 100644 --- a/qcsrc/menu/draw.qc +++ b/qcsrc/menu/draw.qc @@ -1,6 +1,6 @@ #include "draw.qh" -#include "../common/util.qh" -#include "../common/constants.qh" +#include +#include string draw_mousepointer; vector draw_mousepointer_offset; diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index 8e55312ba..84caecb75 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -17,10 +17,10 @@ #include "xonotic/util.qh" -#include "../common/items/_mod.qh" +#include #include -#include "../common/mapinfo.qh" -#include "../common/mutators/base.qh" +#include +#include int mouseButtonsPressed; vector menuMousePos; diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc index cda65308d..2ac3c58d1 100644 --- a/qcsrc/server/campaign.qc +++ b/qcsrc/server/campaign.qc @@ -8,7 +8,7 @@ #include #include "world.qh" -#include "../common/campaign_common.qh" +#include // campaign cvars: // _campaign_index: index of CURRENT map diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index 2306abd69..75d0e2caf 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -11,33 +11,33 @@ #include "clientkill.qh" #include "player.qh" #include "race.qh" -#include "../common/mapobjects/teleporters.qh" +#include #include #include "weapons/tracing.qh" -#include "../common/constants.qh" -#include "../common/deathtypes/all.qh" -#include "../common/util.qh" +#include +#include +#include #include -#include "../common/monsters/_mod.qh" +#include #include #include -#include "../common/mapobjects/subs.qh" +#include #include -#include "../common/mapobjects/func/breakable.qh" +#include -#include "../lib/csqcmodel/sv_model.qh" +#include -#include "../lib/warpzone/anglestransform.qh" -#include "../lib/warpzone/util_server.qh" +#include +#include #ifdef NOCHEATS diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index d67cd46ae..f06f64084 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -33,52 +33,52 @@ #include "bot/api.qh" -#include "../common/ent_cs.qh" -#include "../common/wepent.qh" +#include +#include #include #include "compat/quake3.qh" #include -#include "../common/mapobjects/func/conveyor.qh" +#include #include -#include "../common/mapobjects/teleporters.qh" -#include "../common/mapobjects/target/spawnpoint.qh" +#include +#include #include #include -#include "../common/vehicles/all.qh" +#include #include "weapons/hitplot.qh" #include "weapons/selection.qh" #include "weapons/weaponsystem.qh" -#include "../common/net_notice.qh" -#include "../common/net_linked.qh" -#include "../common/physics/player.qh" +#include +#include +#include #include -#include "../common/items/_mod.qh" +#include #include -#include "../common/mutators/mutator/waypoints/all.qh" -#include "../common/mutators/mutator/instagib/sv_instagib.qh" +#include +#include #include -#include "../common/mapobjects/subs.qh" -#include "../common/mapobjects/triggers.qh" -#include "../common/mapobjects/trigger/secret.qh" +#include +#include +#include -#include "../common/minigames/sv_minigames.qh" +#include -#include "../common/items/inventory.qh" +#include -#include "../common/monsters/sv_monsters.qh" +#include -#include "../lib/warpzone/server.qh" +#include #include diff --git a/qcsrc/server/damage.qc b/qcsrc/server/damage.qc index f0655a9f8..c253c0915 100644 --- a/qcsrc/server/damage.qc +++ b/qcsrc/server/damage.qc @@ -12,31 +12,31 @@ #include "teamplay.qh" #include "scores.qh" #include "spawnpoints.qh" -#include "../common/state.qh" -#include "../common/physics/player.qh" +#include +#include #include "resources.qh" -#include "../common/vehicles/all.qh" -#include "../common/items/_mod.qh" -#include "../common/mutators/mutator/waypoints/waypointsprites.qh" -#include "../common/mutators/mutator/instagib/sv_instagib.qh" -#include "../common/mutators/mutator/buffs/buffs.qh" +#include +#include +#include +#include +#include #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" -#include "../common/constants.qh" -#include "../common/deathtypes/all.qh" +#include +#include #include #include -#include "../common/notifications/all.qh" -#include "../common/physics/movetypes/movetypes.qh" -#include "../common/playerstats.qh" -#include "../common/teams.qh" -#include "../common/util.qh" +#include +#include +#include +#include +#include #include #include #include -#include "../lib/csqcmodel/sv_model.qh" -#include "../lib/warpzone/common.qh" +#include +#include void UpdateFrags(entity player, int f) { diff --git a/qcsrc/server/hook.qc b/qcsrc/server/hook.qc index 596b542e7..4fa2385cf 100644 --- a/qcsrc/server/hook.qc +++ b/qcsrc/server/hook.qc @@ -16,15 +16,15 @@ #include "command/common.qh" #include "command/vote.qh" #include "round_handler.qh" -#include "../common/state.qh" -#include "../common/physics/player.qh" -#include "../common/vehicles/all.qh" -#include "../common/constants.qh" -#include "../common/util.qh" +#include +#include +#include +#include +#include #include #include -#include "../lib/warpzone/common.qh" -#include "../lib/warpzone/server.qh" +#include +#include /*============================================ diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc index 3477c0c88..f42510179 100644 --- a/qcsrc/server/impulse.qc +++ b/qcsrc/server/impulse.qc @@ -16,12 +16,12 @@ #include -#include "../common/minigames/sv_minigames.qh" +#include #include -#include "../common/vehicles/sv_vehicles.qh" +#include -#include "../common/mutators/mutator/waypoints/waypointsprites.qh" +#include .entity vehicle; diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc index 4c386b8f3..bd3aa75c2 100644 --- a/qcsrc/server/ipban.qc +++ b/qcsrc/server/ipban.qc @@ -5,8 +5,8 @@ #include "autocvars.qh" #include #include "command/banning.qh" -#include "../common/constants.qh" -#include "../common/util.qh" +#include +#include /* * Protocol of online ban list: diff --git a/qcsrc/server/main.qc b/qcsrc/server/main.qc index 2546362af..cd84923ae 100644 --- a/qcsrc/server/main.qc +++ b/qcsrc/server/main.qc @@ -17,21 +17,21 @@ #include #include -#include "../common/constants.qh" +#include #include -#include "../common/deathtypes/all.qh" -#include "../common/debug.qh" -#include "../common/mapinfo.qh" -#include "../common/util.qh" +#include +#include +#include +#include -#include "../common/vehicles/all.qh" +#include #include #include -#include "../lib/csqcmodel/sv_model.qh" +#include -#include "../lib/warpzone/common.qh" -#include "../lib/warpzone/server.qh" +#include +#include void CreatureFrame_hotliquids(entity this) { diff --git a/qcsrc/server/mapvoting.qc b/qcsrc/server/mapvoting.qc index d0ade66c5..bb76bde5a 100644 --- a/qcsrc/server/mapvoting.qc +++ b/qcsrc/server/mapvoting.qc @@ -8,12 +8,12 @@ #include "world.qh" #include "command/cmd.qh" #include "command/getreplies.qh" -#include "../common/constants.qh" +#include #include -#include "../common/mapinfo.qh" -#include "../common/playerstats.qh" +#include +#include #include -#include "../common/util.qh" +#include // definitions diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index a632aab01..ed824bd04 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -16,31 +16,31 @@ #include "weapons/throwing.qh" #include "command/common.qh" #include "command/vote.qh" -#include "../common/state.qh" -#include "../common/anim.qh" -#include "../common/animdecide.qh" -#include "../common/csqcmodel_settings.qh" -#include "../common/gamemodes/sv_rules.qh" -#include "../common/deathtypes/all.qh" -#include "../common/mapobjects/subs.qh" +#include +#include +#include +#include +#include +#include +#include #include -#include "../common/playerstats.qh" -#include "../lib/csqcmodel/sv_model.qh" +#include +#include -#include "../common/minigames/sv_minigames.qh" +#include #include -#include "../common/physics/player.qh" -#include "../common/effects/qc/_mod.qh" -#include "../common/mutators/mutator/waypoints/waypointsprites.qh" -#include "../common/mapobjects/_mod.qh" -#include "../common/wepent.qh" +#include +#include +#include +#include +#include #include "weapons/weaponstats.qh" #include -#include "../common/animdecide.qh" +#include void Drop_Special_Items(entity player) { diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index 7abe6ae97..2c5839175 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -5,20 +5,20 @@ #include "mutators/_mod.qh" #include #include -#include "../common/constants.qh" -#include "../common/deathtypes/all.qh" -#include "../common/notifications/all.qh" -#include "../common/mapobjects/teleporters.qh" +#include +#include +#include +#include #include -#include "../common/mapobjects/subs.qh" -#include "../common/util.qh" +#include +#include #include -#include "../lib/csqcmodel/sv_model.qh" -#include "../lib/warpzone/anglestransform.qh" -#include "../lib/warpzone/util_server.qh" -#include "../lib/warpzone/common.qh" -#include "../common/vehicles/vehicle.qh" -#include "../common/vehicles/sv_vehicles.qh" +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc index bc07efd58..f7769e6eb 100644 --- a/qcsrc/server/race.qc +++ b/qcsrc/server/race.qc @@ -16,19 +16,19 @@ #include "spawnpoints.qh" #include "bot/api.qh" #include "command/getreplies.qh" -#include "../common/deathtypes/all.qh" -#include "../common/notifications/all.qh" +#include +#include #include #include #include #include #include -#include "../common/mapobjects/subs.qh" +#include #include -#include "../lib/warpzone/util_server.qh" -#include "../lib/warpzone/common.qh" +#include +#include #include -#include "../common/mutators/mutator/waypoints/waypointsprites.qh" +#include string uid2name(string myuid) { diff --git a/qcsrc/server/round_handler.qc b/qcsrc/server/round_handler.qc index fa970f955..bc0b23b8f 100644 --- a/qcsrc/server/round_handler.qc +++ b/qcsrc/server/round_handler.qc @@ -4,7 +4,7 @@ #include "campaign.qh" #include "command/vote.qh" #include -#include "../common/util.qh" +#include void round_handler_Think(entity this) { diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc index 73d03ae78..10ffc9c7e 100644 --- a/qcsrc/server/scores.qc +++ b/qcsrc/server/scores.qc @@ -8,8 +8,8 @@ #include #include #include -#include "../common/playerstats.qh" -#include "../common/teams.qh" +#include +#include #include #include #include diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index 4bcffe68a..61969ae35 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -5,16 +5,16 @@ #include "race.qh" #include #include -#include "../common/constants.qh" +#include #include -#include "../common/teams.qh" +#include #include -#include "../common/mapobjects/subs.qh" -#include "../common/mapobjects/target/spawnpoint.qh" +#include +#include #include -#include "../common/util.qh" -#include "../lib/warpzone/common.qh" -#include "../lib/warpzone/util_server.qh" +#include +#include +#include #include #include #include diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index 1c436da96..118900398 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -13,9 +13,9 @@ #include -#include "../common/deathtypes/all.qh" +#include #include -#include "../common/teams.qh" +#include /// \brief Describes a state of team balance entity. enum diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc index 88890fc2f..de5e63e6b 100644 --- a/qcsrc/server/world.qc +++ b/qcsrc/server/world.qc @@ -25,28 +25,28 @@ #include "teamplay.qh" #include "weapons/weaponstats.qh" #include -#include "../common/constants.qh" +#include #include -#include "../common/deathtypes/all.qh" +#include #include -#include "../common/gamemodes/sv_rules.qh" -#include "../common/mapinfo.qh" -#include "../common/monsters/_mod.qh" -#include "../common/monsters/sv_monsters.qh" -#include "../common/vehicles/all.qh" -#include "../common/notifications/all.qh" -#include "../common/physics/player.qh" -#include "../common/playerstats.qh" -#include "../common/stats.qh" -#include "../common/teams.qh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include "../common/mapobjects/trigger/secret.qh" -#include "../common/mapobjects/target/music.qh" -#include "../common/util.qh" -#include "../common/items/_mod.qh" +#include +#include +#include +#include #include -#include "../common/state.qh" +#include const float LATENCY_THINKRATE = 10; .float latency_sum; -- 2.39.2