From: Mario <mario.mario@y7mail.com>
Date: Fri, 16 Oct 2020 11:16:08 +0000 (+1000)
Subject: Apply a standard alphabetical sort order to the client side includes and use constant... 
X-Git-Tag: xonotic-v0.8.5~733
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=259f742ec4bb20af8c44cd636daf7077eafa23ab;p=xonotic%2Fxonotic-data.pk3dir.git

Apply a standard alphabetical sort order to the client side includes and use constant paths
---

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 <client/hud/panel/centerprint.qh>
 #include <client/mutators/_mod.qh>
-
 #include <common/notifications/all.qh>
 #include <common/stats.qh>
-#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 <common/util.qh>
 #include <client/autocvars.qh>
 #include <client/main.qh>
+#include <common/util.qh>
 
 #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 <common/command/_mod.qh>
-#include "cl_cmd.qh"
-
-#include "../autocvars.qh"
+#include <client/autocvars.qh>
 #include <client/draw.qh>
 #include <client/hud/_mod.qh>
 #include <client/hud/panel/quickmenu.qh>
 #include <client/hud/panel/radar.qh>
 #include <client/hud/panel/scoreboard.qh>
 #include <client/hud/panel/vote.qh>
-#include "../mapvoting.qh"
-#include <client/view.qh>
-
+#include <client/mapvoting.qh>
 #include <client/mutators/_mod.qh>
-
-#include <common/minigames/cl_minigames_hud.qh>
-
+#include <client/view.qh>
+#include <common/command/_mod.qh>
 #include <common/mapinfo.qh>
+#include <common/minigames/cl_minigames_hud.qh>
 
 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 <client/autocvars.qh>
 #include <client/mutators/_mod.qh>
-#include "player_skeleton.qh"
-#include "weapons/projectile.qh"
+#include <client/player_skeleton.qh>
+#include <client/weapons/projectile.qh>
 #include <common/animdecide.qh>
+#include <common/effects/all.inc>
+#include <common/effects/all.qh>
 #include <common/ent_cs.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/mapinfo.qh>
 #include <common/physics/movetypes/movetypes.qh>
 #include <common/physics/player.qh>
 #include <common/viewloc.qh>
-#include <common/effects/all.qh>
-#include <common/effects/all.inc>
 #include <lib/csqcmodel/cl_model.qh>
 #include <lib/csqcmodel/cl_player.qh>
 #include <lib/csqcmodel/interpolate.qh>
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 <client/draw.qh>
 #include <client/hud/panel/scoreboard.qh>
 #include <client/view.qh>
-
-#include <lib/csqcmodel/cl_player.qh>
 #include <common/deathtypes/all.qh>
 #include <common/ent_cs.qh>
-#include <common/vehicles/all.qh>
-#include <common/viewloc.qh>
 #include <common/mapobjects/trigger/viewloc.qh>
-#include <common/wepent.qh>
 #include <common/minigames/cl_minigames.qh>
 #include <common/minigames/cl_minigames_hud.qh>
 #include <common/mutators/mutator/overkill/oknex.qh>
+#include <common/vehicles/all.qh>
+#include <common/viewloc.qh>
+#include <common/wepent.qh>
+#include <lib/csqcmodel/cl_player.qh>
 
 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 <client/draw.qh>
+#include <client/hud/hud_config.qh>
+#include <client/hud/panel/scoreboard.qh>
 #include <client/items/items.qh>
+#include <client/mapvoting.qh>
+#include <client/teamradar.qh>
 #include <client/view.qh>
-#include "panel/scoreboard.qh"
-#include "hud_config.qh"
-#include "../mapvoting.qh"
-#include "../teamradar.qh"
-#include <common/minigames/cl_minigames.qh>
 #include <common/deathtypes/all.qh>
 #include <common/ent_cs.qh>
+#include <common/gamemodes/_mod.qh>
 #include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
-#include <common/vehicles/all.qh>
-#include <common/vehicles/vehicle/bumblebee.qh>
+#include <common/minigames/cl_minigames.qh>
 #include <common/mutators/mutator/waypoints/all.qh>
 #include <common/stats.qh>
-#include <lib/csqcmodel/cl_player.qh>
+#include <common/vehicles/all.qh>
+#include <common/vehicles/vehicle/bumblebee.qh>
 #include <lib/csqcmodel/cl_model.qh>
-#include <common/gamemodes/_mod.qh>
+#include <lib/csqcmodel/cl_player.qh>
 
 
 /*
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 <client/autocvars.qh>
 #include <client/draw.qh>
+#include <client/hud/hud.qh>
+#include <client/hud/panel/scoreboard.qh>
 #include <client/view.qh>
 
 // 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 <client/draw.qh>
 #include <client/items/items.qh>
 #include <client/view.qh>
-#include <common/wepent.qh>
 #include <common/mutators/mutator/nades/nades.qh>
+#include <common/wepent.qh>
 
 // 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 <common/notifications/all.qh>
 #include <client/draw.qh>
+#include <client/hud/panel/scoreboard.qh>
+#include <common/notifications/all.qh>
 
 // 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 <client/draw.qh>
-
 #include <common/deathtypes/all.qh>
 
 // 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 <client/autocvars.qh>
 #include <client/draw.qh>
-
 #include <common/ent_cs.qh>
 
 // 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 <client/autocvars.qh>
 #include <client/draw.qh>
-#include <common/mapinfo.qh>
 #include <common/ent_cs.qh>
-#include <common/scores.qh>
 #include <common/gamemodes/_mod.qh>
 #include <common/gamemodes/gamemode/ctf/cl_ctf.qh>
+#include <common/mapinfo.qh>
+#include <common/scores.qh>
 
 // 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 <client/autocvars.qh>
 #include <client/draw.qh>
-#include <common/ent_cs.qh>
-#include <common/minigames/cl_minigames.qh>
 #include <client/hud/_mod.qh>
 #include <client/mapvoting.qh>
+#include <common/ent_cs.qh>
+#include <common/minigames/cl_minigames.qh>
 
 // 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 <client/autocvars.qh>
 #include <client/draw.qh>
-#include <common/ent_cs.qh>
 #include <client/mapvoting.qh>
 #include <client/resources.qh>
 #include <client/teamradar.qh>
+#include <common/ent_cs.qh>
 #include <common/mutators/mutator/waypoints/all.qh>
 
 // 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 <client/autocvars.qh>
 #include <client/draw.qh>
-#include "scoreboard.qh"
+#include <client/hud/panel/scoreboard.qh>
 #include <common/ent_cs.qh>
 #include <common/scores.qh>
 
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 <client/autocvars.qh>
 #include <client/draw.qh>
+#include <client/hud/panel/quickmenu.qh>
 #include <client/hud/panel/racetimer.qh>
 #include <client/hud/panel/weapons.qh>
-#include "quickmenu.qh"
-#include <common/ent_cs.qh>
 #include <common/constants.qh>
-#include <common/net_linked.qh>
+#include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 #include <common/minigames/cl_minigames.qh>
+#include <common/net_linked.qh>
 #include <common/scores.qh>
 #include <common/stats.qh>
 #include <common/teams.qh>
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 <common/items/_mod.qh>
-
 #include <client/main.qh>
+#include <common/items/_mod.qh>
 #include <common/physics/movetypes/movetypes.qh>
 #include <common/weapons/_all.qh>
 #include <lib/csqcmodel/cl_model.qh>
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 <client/command/cl_cmd.qh>
 #include <client/draw.qh>
+#include <client/hud/_mod.qh>
+#include <client/hud/panel/centerprint.qh>
+#include <client/hud/panel/quickmenu.qh>
+#include <client/hud/panel/scoreboard.qh>
 #include <client/items/items.qh>
-#include <common/ent_cs.qh>
-#include <common/effects/effect.qh>
-#include <common/effects/qc/_mod.qh>
-#include <common/effects/all.qh>
-#include <common/effects/all.inc>
-#include "hud/_mod.qh"
-#include "command/cl_cmd.qh"
-#include "mapvoting.qh"
+#include <client/mapvoting.qh>
 #include <client/mutators/_mod.qh>
-#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 <client/shownames.qh>
+#include <client/view.qh>
+#include <client/weapons/projectile.qh>
 #include <common/deathtypes/all.qh>
-#include <common/items/_mod.qh>
+#include <common/effects/all.inc>
+#include <common/effects/all.qh>
+#include <common/effects/effect.qh>
+#include <common/effects/qc/_mod.qh>
+#include <common/ent_cs.qh>
 #include <common/gamemodes/gamemode/nexball/cl_nexball.qh>
+#include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
+#include <common/mapobjects/_mod.qh>
 #include <common/minigames/cl_minigames.qh>
 #include <common/minigames/cl_minigames_hud.qh>
 #include <common/net_linked.qh>
 #include <common/net_notice.qh>
 #include <common/scores.qh>
-#include <common/mapobjects/_mod.qh>
 #include <common/vehicles/all.qh>
 #include <lib/csqcmodel/cl_model.qh>
 #include <lib/csqcmodel/interpolate.qh>
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 <client/autocvars.qh>
 #include <client/draw.qh>
-#include "hud/_mod.qh"
-#include "hud/panel/scoreboard.qh"
-
+#include <client/hud/_mod.qh>
+#include <client/hud/panel/scoreboard.qh>
 #include <common/mapinfo.qh>
 #include <common/util.qh>
 
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 <client/mutators/_mod.qh>
 #include <common/physics/movetypes/movetypes.qh>
 #include <common/physics/player.qh>
-#include <client/mutators/_mod.qh>
 #include <lib/csqcmodel/cl_player.qh>
 #include <lib/warpzone/anglestransform.qh>
 
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 <common/items/item/ammo.qh>
 
 /// \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 <client/autocvars.qh>
 #include <client/draw.qh>
-#include "resources.qh"
+#include <client/hud/_mod.qh>
+#include <client/resources.qh>
 #include <client/view.qh>
-#include "hud/_mod.qh"
-
-#include <common/ent_cs.qh>
 #include <common/constants.qh>
+#include <common/ent_cs.qh>
 #include <common/net_linked.qh>
 #include <common/teams.qh>
-
 #include <lib/csqcmodel/cl_model.qh>
 
 // 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 <client/autocvars.qh>
+#include <client/hud/_mod.qh>
 #include <common/mutators/mutator/waypoints/all.qh>
-
 #include <lib/csqcmodel/interpolate.qh>
 
 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 <client/announcer.qh>
+#include <client/autocvars.qh>
+#include <client/csqcmodel_hooks.qh>
 #include <client/draw.qh>
-#include "announcer.qh"
-#include "hud/_mod.qh"
-#include "mapvoting.qh"
-#include "shownames.qh"
-#include "hud/panel/scoreboard.qh"
-#include "hud/panel/quickmenu.qh"
-
+#include <client/hud/_mod.qh>
+#include <client/hud/panel/quickmenu.qh>
+#include <client/hud/panel/scoreboard.qh>
+#include <client/mapvoting.qh>
 #include <client/mutators/_mod.qh>
-
+#include <client/shownames.qh>
+#include <common/anim.qh>
 #include <common/animdecide.qh>
+#include <common/constants.qh>
 #include <common/deathtypes/all.qh>
+#include <common/debug.qh>
 #include <common/ent_cs.qh>
-#include <common/anim.qh>
-#include <common/constants.qh>
+#include <common/gamemodes/_mod.qh>
+#include <common/mapinfo.qh>
+#include <common/mapobjects/target/music.qh>
+#include <common/mapobjects/trigger/viewloc.qh>
+#include <common/minigames/cl_minigames.qh>
+#include <common/minigames/cl_minigames_hud.qh>
+#include <common/mutators/mutator/waypoints/all.qh>
 #include <common/net_linked.qh>
 #include <common/net_notice.qh>
-#include <common/debug.qh>
-#include <common/mapinfo.qh>
-#include <common/gamemodes/_mod.qh>
 #include <common/physics/player.qh>
 #include <common/stats.qh>
-#include <common/mapobjects/target/music.qh>
 #include <common/teams.qh>
-#include <common/wepent.qh>
-
-#include <common/weapons/weapon/tuba.qh>
-
 #include <common/vehicles/all.qh>
-#include <common/weapons/_all.qh>
-#include <common/mutators/mutator/waypoints/all.qh>
 #include <common/viewloc.qh>
-#include <common/mapobjects/trigger/viewloc.qh>
-#include <common/minigames/cl_minigames.qh>
-#include <common/minigames/cl_minigames_hud.qh>
-
-#include <lib/csqcmodel/cl_player.qh>
+#include <common/weapons/_all.qh>
+#include <common/weapons/weapon/tuba.qh>
+#include <common/wepent.qh>
 #include <lib/csqcmodel/cl_model.qh>
-#include "csqcmodel_hooks.qh"
-
+#include <lib/csqcmodel/cl_player.qh>
 #include <lib/warpzone/client.qh>
 #include <lib/warpzone/common.qh>
 
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 <client/autocvars.qh>
 #include <client/mutators/_mod.qh>
-
 #include <common/constants.qh>
-#include <common/effects/effect.qh>
 #include <common/effects/all.qh>
+#include <common/effects/effect.qh>
+#include <common/mutators/mutator/nades/nades.qh>
 #include <common/net_linked.qh>
 #include <common/physics/movetypes/movetypes.qh>
-
-#include <common/mutators/mutator/nades/nades.qh>
-
 #include <lib/csqcmodel/interpolate.qh>
-
 #include <lib/warpzone/anglestransform.qh>
 
 .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