From 259f742ec4bb20af8c44cd636daf7077eafa23ab Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 16 Oct 2020 21:16:08 +1000 Subject: [PATCH] Apply a standard alphabetical sort order to the client side includes and use constant paths --- qcsrc/client/announcer.qc | 3 +- qcsrc/client/bgmscript.qc | 2 +- qcsrc/client/command/cl_cmd.qc | 16 +++--- qcsrc/client/csqcmodel_hooks.qc | 11 ++-- qcsrc/client/hud/crosshair.qc | 9 ++-- qcsrc/client/hud/hud.qc | 18 +++---- qcsrc/client/hud/hud_config.qc | 4 +- qcsrc/client/hud/panel/ammo.qc | 2 +- qcsrc/client/hud/panel/centerprint.qc | 4 +- qcsrc/client/hud/panel/healtharmor.qc | 1 - qcsrc/client/hud/panel/infomessages.qc | 1 - qcsrc/client/hud/panel/modicons.qc | 4 +- qcsrc/client/hud/panel/quickmenu.qc | 4 +- qcsrc/client/hud/panel/radar.qc | 2 +- qcsrc/client/hud/panel/score.qc | 2 +- qcsrc/client/hud/panel/scoreboard.qc | 6 +-- qcsrc/client/items/items.qc | 3 +- qcsrc/client/main.qc | 32 ++++++------ qcsrc/client/mapvoting.qc | 7 ++- qcsrc/client/player_skeleton.qc | 2 +- qcsrc/client/resources.qc | 1 + qcsrc/client/shownames.qc | 10 ++-- qcsrc/client/teamradar.qc | 6 +-- qcsrc/client/view.qc | 50 ++++++++----------- qcsrc/client/weapons/projectile.qc | 10 ++-- .../dynamic_handicap/sv_dynamic_handicap.qc | 2 +- 26 files changed, 95 insertions(+), 117 deletions(-) diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index ae04b5be1..a5b3eecb1 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -1,10 +1,9 @@ #include "announcer.qh" +#include #include - #include #include -#include "hud/panel/centerprint.qh" bool announcer_1min; bool announcer_5min; diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc index c864f0d6a..da5c911e3 100644 --- a/qcsrc/client/bgmscript.qc +++ b/qcsrc/client/bgmscript.qc @@ -1,8 +1,8 @@ #include "bgmscript.qh" -#include #include #include +#include #define CONSTANT_SPEED_DECAY diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc index f65b0429d..e143f8dbf 100644 --- a/qcsrc/client/command/cl_cmd.qc +++ b/qcsrc/client/command/cl_cmd.qc @@ -1,27 +1,23 @@ #include "cl_cmd.qh" + // ============================================== // CSQC client commands code, written by Samual // Last updated: December 28th, 2011 // ============================================== -#include -#include "cl_cmd.qh" - -#include "../autocvars.qh" +#include #include #include #include #include #include #include -#include "../mapvoting.qh" -#include - +#include #include - -#include - +#include +#include #include +#include void DrawDebugModel(entity this) { diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 73452dc71..c5763a18f 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -1,17 +1,18 @@ #include "csqcmodel_hooks.qh" -#include "autocvars.qh" + +#include #include -#include "player_skeleton.qh" -#include "weapons/projectile.qh" +#include +#include #include +#include +#include #include #include #include #include #include #include -#include -#include #include #include #include diff --git a/qcsrc/client/hud/crosshair.qc b/qcsrc/client/hud/crosshair.qc index f77ef6722..7142b05fb 100644 --- a/qcsrc/client/hud/crosshair.qc +++ b/qcsrc/client/hud/crosshair.qc @@ -4,17 +4,16 @@ #include #include #include - -#include #include #include -#include -#include #include -#include #include #include #include +#include +#include +#include +#include float pickup_crosshair_time, pickup_crosshair_size; float hitindication_crosshair_size; diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index 26561f1d7..7cb9919b8 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -1,24 +1,24 @@ #include "hud.qh" #include +#include +#include #include +#include +#include #include -#include "panel/scoreboard.qh" -#include "hud_config.qh" -#include "../mapvoting.qh" -#include "../teamradar.qh" -#include #include #include +#include #include #include -#include -#include +#include #include #include -#include +#include +#include #include -#include +#include /* diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc index 0b4c58c21..834107e52 100644 --- a/qcsrc/client/hud/hud_config.qc +++ b/qcsrc/client/hud/hud_config.qc @@ -1,9 +1,9 @@ #include "hud_config.qh" -#include "hud.qh" -#include "panel/scoreboard.qh" #include #include +#include +#include #include // Save the config diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc index dd4c59f04..aa9a1a7a8 100644 --- a/qcsrc/client/hud/panel/ammo.qc +++ b/qcsrc/client/hud/panel/ammo.qc @@ -4,8 +4,8 @@ #include #include #include -#include #include +#include // Ammo (#1) diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc index 7723c1f44..a0a5389e7 100644 --- a/qcsrc/client/hud/panel/centerprint.qc +++ b/qcsrc/client/hud/panel/centerprint.qc @@ -1,8 +1,8 @@ #include "centerprint.qh" -#include "scoreboard.qh" -#include #include +#include +#include // CenterPrint (#16) diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc index 5a3214ad9..993bf091d 100644 --- a/qcsrc/client/hud/panel/healtharmor.qc +++ b/qcsrc/client/hud/panel/healtharmor.qc @@ -1,7 +1,6 @@ #include "healtharmor.qh" #include - #include // Health/armor (#3) diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc index d5c7cb8c4..7ebc35fcb 100644 --- a/qcsrc/client/hud/panel/infomessages.qc +++ b/qcsrc/client/hud/panel/infomessages.qc @@ -2,7 +2,6 @@ #include #include - #include // Info messages (#14) diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc index 49f2dab8a..e488e31ac 100644 --- a/qcsrc/client/hud/panel/modicons.qc +++ b/qcsrc/client/hud/panel/modicons.qc @@ -2,11 +2,11 @@ #include #include -#include #include -#include #include #include +#include +#include // Mod icons (#10) diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index 29640c219..a0cc09a01 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -2,10 +2,10 @@ #include #include -#include -#include #include #include +#include +#include // QuickMenu (#23) diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc index 0f2131da0..1aa07f4d1 100644 --- a/qcsrc/client/hud/panel/radar.qc +++ b/qcsrc/client/hud/panel/radar.qc @@ -2,10 +2,10 @@ #include #include -#include #include #include #include +#include #include // Radar (#6) diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc index 43125e9b5..bf77d739f 100644 --- a/qcsrc/client/hud/panel/score.qc +++ b/qcsrc/client/hud/panel/score.qc @@ -2,7 +2,7 @@ #include #include -#include "scoreboard.qh" +#include #include #include diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index c4e87a3cd..7f3c8e5c2 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -2,14 +2,14 @@ #include #include +#include #include #include -#include "quickmenu.qh" -#include #include -#include +#include #include #include +#include #include #include #include diff --git a/qcsrc/client/items/items.qc b/qcsrc/client/items/items.qc index 06135a9f2..064be587e 100644 --- a/qcsrc/client/items/items.qc +++ b/qcsrc/client/items/items.qc @@ -1,8 +1,7 @@ #include "items.qh" -#include - #include +#include #include #include #include diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index d111e8aad..16600f743 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,32 +1,32 @@ #include "main.qh" +#include #include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include "hud/_mod.qh" -#include "command/cl_cmd.qh" -#include "mapvoting.qh" +#include #include -#include "hud/panel/centerprint.qh" -#include "hud/panel/scoreboard.qh" -#include "hud/panel/quickmenu.qh" -#include "shownames.qh" -#include "view.qh" -#include "weapons/projectile.qh" +#include +#include +#include #include -#include +#include +#include +#include +#include +#include #include +#include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 7a1726c84..f8ae14bff 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -1,10 +1,9 @@ #include "mapvoting.qh" -#include "autocvars.qh" +#include #include -#include "hud/_mod.qh" -#include "hud/panel/scoreboard.qh" - +#include +#include #include #include diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc index ef2b6c4cb..59a790750 100644 --- a/qcsrc/client/player_skeleton.qc +++ b/qcsrc/client/player_skeleton.qc @@ -1,8 +1,8 @@ #include "player_skeleton.qh" +#include #include #include -#include #include #include diff --git a/qcsrc/client/resources.qc b/qcsrc/client/resources.qc index 88a1fffc9..5408872b4 100644 --- a/qcsrc/client/resources.qc +++ b/qcsrc/client/resources.qc @@ -1,4 +1,5 @@ #include "resources.qh" + #include /// \file diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index fcca84189..20c5fe55f 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -1,16 +1,14 @@ #include "shownames.qh" -#include "autocvars.qh" +#include #include -#include "resources.qh" +#include +#include #include -#include "hud/_mod.qh" - -#include #include +#include #include #include - #include // this.isactive = player is in range and coordinates/status (health and armor) are up to date diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 130d1e74b..f0111983f 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -1,10 +1,8 @@ #include "teamradar.qh" -#include "autocvars.qh" -#include "hud/_mod.qh" - +#include +#include #include - #include vector teamradar_3dcoord_to_texcoord(vector in) diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index ca1d5324c..d4eec15d5 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1,46 +1,40 @@ #include "view.qh" -#include "autocvars.qh" +#include +#include +#include #include -#include "announcer.qh" -#include "hud/_mod.qh" -#include "mapvoting.qh" -#include "shownames.qh" -#include "hud/panel/scoreboard.qh" -#include "hud/panel/quickmenu.qh" - +#include +#include +#include +#include #include - +#include +#include #include +#include #include +#include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include #include #include -#include #include -#include - -#include - #include -#include -#include #include -#include -#include -#include - -#include +#include +#include +#include #include -#include "csqcmodel_hooks.qh" - +#include #include #include diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index 3e1f5cade..cd582a092 100644 --- a/qcsrc/client/weapons/projectile.qc +++ b/qcsrc/client/weapons/projectile.qc @@ -1,18 +1,14 @@ #include "projectile.qh" -#include "../autocvars.qh" +#include #include - #include -#include #include +#include +#include #include #include - -#include - #include - #include .float alpha; diff --git a/qcsrc/common/mutators/mutator/dynamic_handicap/sv_dynamic_handicap.qc b/qcsrc/common/mutators/mutator/dynamic_handicap/sv_dynamic_handicap.qc index 4cfc0dd23..237d14a6e 100644 --- a/qcsrc/common/mutators/mutator/dynamic_handicap/sv_dynamic_handicap.qc +++ b/qcsrc/common/mutators/mutator/dynamic_handicap/sv_dynamic_handicap.qc @@ -8,7 +8,7 @@ //======================= Global variables ==================================== int autocvar_g_dynamic_handicap; ///< Whether to enable dynamic handicap. -/// \brief The scale of the handicap. Larget values mean more penalties for +/// \brief The scale of the handicap. Larger values mean more penalties for /// strong players and more buffs for weak players. float autocvar_g_dynamic_handicap_scale; /// \brief The exponent used to calculate handicap. 1 means linear scale. Values -- 2.39.2