]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Apply a standard alphabetical sort order to the client side includes and use constant...
authorMario <mario.mario@y7mail.com>
Fri, 16 Oct 2020 11:16:08 +0000 (21:16 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 16 Oct 2020 11:16:08 +0000 (21:16 +1000)
26 files changed:
qcsrc/client/announcer.qc
qcsrc/client/bgmscript.qc
qcsrc/client/command/cl_cmd.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hud/crosshair.qc
qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud_config.qc
qcsrc/client/hud/panel/ammo.qc
qcsrc/client/hud/panel/centerprint.qc
qcsrc/client/hud/panel/healtharmor.qc
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/hud/panel/modicons.qc
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/hud/panel/radar.qc
qcsrc/client/hud/panel/score.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/items/items.qc
qcsrc/client/main.qc
qcsrc/client/mapvoting.qc
qcsrc/client/player_skeleton.qc
qcsrc/client/resources.qc
qcsrc/client/shownames.qc
qcsrc/client/teamradar.qc
qcsrc/client/view.qc
qcsrc/client/weapons/projectile.qc
qcsrc/common/mutators/mutator/dynamic_handicap/sv_dynamic_handicap.qc

index ae04b5be15e5b866fda2a185ac58397727cd5101..a5b3eecb113348059da3013953e4697ff5b18a42 100644 (file)
@@ -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;
index c864f0d6a15af48299e9387afa24a07f1a5fe31a..da5c911e330bf7abad7ffb518571bc768312a6f7 100644 (file)
@@ -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
 
index f65b0429da7523ded29b5e30eee157574e4cf6eb..e143f8dbf14bccf96b129ff726f6445cadbafee8 100644 (file)
@@ -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)
 {
index 73452dc7119dfa7e1697a0e61b49ea917eba48a3..c5763a18f1a7c08e8121e446e07c3b3a43507a65 100644 (file)
@@ -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>
index f77ef67228332b49da67dea8a9b06d9d655c2a13..7142b05fbc816fadcce6d39233f45fd823a53900 100644 (file)
@@ -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;
index 26561f1d75bc4c8a86f1893e9cf090595c101c3d..7cb9919b8eca18d3976dfcd5f44a9757f253bfc6 100644 (file)
@@ -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>
 
 
 /*
index 0b4c58c2160babae9ea7decb39cc8e9426f676d0..834107e52533ca2af58a22f00af04e50c202fbd1 100644 (file)
@@ -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
index dd4c59f04dc7442b073329211d9bb3bf6f79560a..aa9a1a7a8e3460271970ef14c44f38eb891cc0c2 100644 (file)
@@ -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)
 
index 7723c1f44496172dbaec3b794891280f853cd9cb..a0a5389e7e159e9e3f4ac52df534303ef47da9b0 100644 (file)
@@ -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)
 
index 5a3214ad99e15a91cd8320951ec9cd8bbd6fa437..993bf091d73f0c46156b2ed5bed93ee225ba2f1f 100644 (file)
@@ -1,7 +1,6 @@
 #include "healtharmor.qh"
 
 #include <client/draw.qh>
-
 #include <common/deathtypes/all.qh>
 
 // Health/armor (#3)
index d5c7cb8c45685a7d40a99bd5377a1094f91cbf11..7ebc35fcb68a4cdb15282550d870a7296ffbb039 100644 (file)
@@ -2,7 +2,6 @@
 
 #include <client/autocvars.qh>
 #include <client/draw.qh>
-
 #include <common/ent_cs.qh>
 
 // Info messages (#14)
index 49f2dab8ae3ffe172f60a9f22a4729b7c646f35c..e488e31ac38540b301cc93258eee3ad89451ceaf 100644 (file)
@@ -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)
 
index 29640c219bc3b2853a4dede52491163e8e65e37d..a0cc09a0147931d37e6112a3f04ce6ea336c25e9 100644 (file)
@@ -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)
 
index 0f2131da065e49c12561948e8dd239feb001bfbe..1aa07f4d106b2e2e21c89fec6cc8236ed006628b 100644 (file)
@@ -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)
index 43125e9b5017385a5101e6b1edf42f5aabda25c1..bf77d739fce3f7217cb82d7c771e25310724871f 100644 (file)
@@ -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>
 
index c4e87a3cd9f15c4bfccc9892bc569e5cea728056..7f3c8e5c28a3596d424a39d074d93eff89a96333 100644 (file)
@@ -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>
index 06135a9f2962591fd2b833d01aa164c85ef9e6ba..064be587e78fc46087e2d4eabad563d84f25885c 100644 (file)
@@ -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>
index d111e8aadaaa023c09c4a1dfdd98f1c8b65d7187..16600f7433eb17b1af72c33ded08c7db7183d9ec 100644 (file)
@@ -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>
index 7a1726c8466a7231278afd9cc9993629542d3611..f8ae14bffb17ab61e00e44181246f46c6089509a 100644 (file)
@@ -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>
 
index ef2b6c4cb23bb00ba83cc4d334c300da2bc121d8..59a7907508f750e00956dbae8e6eca1d0e42e367 100644 (file)
@@ -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>
 
index 88a1fffc931c2cb23ebe36c9ff00432d189c054b..5408872b4e6e1f9b8cb4a34a30e1284f05aecf2d 100644 (file)
@@ -1,4 +1,5 @@
 #include "resources.qh"
+
 #include <common/items/item/ammo.qh>
 
 /// \file
index fcca84189f697a9ac0e1d18368abc5384ae17a85..20c5fe55f80f7ab8fe58b056799de647ed14e3ad 100644 (file)
@@ -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
index 130d1e74b72e45c2d27000a832800ed6b0d1288b..f0111983fe6c8ea9e7c7901cd1456341b6dcd5e9 100644 (file)
@@ -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)
index ca1d5324cb72aa5d27083d5a4d9ff715179a75d0..d4eec15d59777690d8ca3038f6723b8a7d9beba8 100644 (file)
@@ -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>
 
index 3e1f5cade690e0db50fd703d9eae898e59fe0f61..cd582a092f9cbc4fe9fd9a08a51304ae4d104d88 100644 (file)
@@ -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;
index 4cfc0dd23779d4f5babee08a864b2fcce14dfdcd..237d14a6e72a38a328663562645aebfbde9b8493 100644 (file)
@@ -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