Sort #includes

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 116dba7d3cc5898bf6acc70f13772e810babdd6c..5de03953cd4e4dc3a25c7a541a7dcc43c5f907e6 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,13 +1,11 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-    #include "../common/stats.qh"
-    #include "../common/util.qh"
-    #include "autocvars.qh"
-    #include "../common/notifications.qh"
-    #include "main.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "announcer.qh"
+
+#include "autocvars.qh"
+#include "main.qh"
+#include "../common/notifications.qh"
+#include "../common/stats.qh"
+#include "../common/util.qh"
+#include "../dpdefs/csprogsdefs.qh"
 
 bool announcer_1min;
 bool announcer_5min;

diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc
index 7bc3b9b1aa45eeacefd1a77d6887e95137a7e46c..70c4bab3f14da153a90c12cff8e653084e4c2b2b 100644 (file)
--- a/qcsrc/client/bgmscript.qc
+++ b/qcsrc/client/bgmscript.qc
@@ -1,13 +1,10 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "defs.qh"
-       #include "../common/util.qh"
-       #include "autocvars.qh"
-       #include "bgmscript.qh"
-       #include "main.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "bgmscript.qh"
+
+#include "autocvars.qh"
+#include "defs.qh"
+#include "main.qh"
+#include "../common/util.qh"
+#include "../dpdefs/csprogsdefs.qh"
 
 #define CONSTANT_SPEED_DECAY
 

diff --git a/qcsrc/client/casings.qc b/qcsrc/client/casings.qc
index 97f6271237356036fbe891e0317cab05b0cf8f78..c80c9bc6a48bf04e19c8782d50f3c5df630a41ac 100644 (file)
--- a/qcsrc/client/casings.qc
+++ b/qcsrc/client/casings.qc
@@ -1,18 +1,16 @@
-#if defined(CSQC)
-       #include "autocvars.qh"
-       #include "../common/util.qh"
-       #include "defs.qh"
-       #include "main.qh"
-       #include "movetypes.qh"
-       #include "prandom.qh"
-       #include "rubble.qh"
-
-       .float cnt;
-       .float alpha;
-       .int state;
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "casings.qh"
+
+#include "autocvars.qh"
+#include "defs.qh"
+#include "main.qh"
+#include "movetypes.qh"
+#include "prandom.qh"
+#include "rubble.qh"
+#include "../common/util.qh"
+
+.float cnt;
+.float alpha;
+.int state;
 
 entityclass(Casing)
 class(Casing) .bool silent;

diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index 8b5fc51533d19832701ff2d96f73f9ff82930886..5a69fbbd0378aec476262a5b9642a56cb7065fbd 100644 (file)
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -5,9 +5,6 @@
 
 #include "cl_cmd.qh"
 
-#include "../../common/mapinfo.qh"
-#include "../../common/command/generic.qh"
-#include "../../common/command/shared_defs.qh"
 #include "../autocvars.qh"
 #include "../defs.qh"
 #include "../hud.qh"
@@ -16,6 +13,9 @@
 #include "../mapvoting.qh"
 #include "../miscfunctions.qh"
 #include "../scoreboard.qh"
+#include "../../common/command/generic.qh"
+#include "../../common/command/shared_defs.qh"
+#include "../../common/mapinfo.qh"
 
 void DrawDebugModel()
 {

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 987d166febc5fbf3de666a0db8596b5bfa8315ce..2337266cf280838dd2421dbac1c8c7b2ca6cfcd5 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -1,30 +1,23 @@
-#if defined(CSQC)
-       #include "defs.qh"
-       #include "gibs.qh"
-       #include "miscfunctions.qh"
-       #include "player_skeleton.qh"
-       #include "sortlist.qh"
-       #include "main.qh"
-
-       #include "../client/autocvars.qh"
-       #include "../client/weapons/projectile.qh"
-
-       #include "../common/animdecide.qh"
-       #include "../common/csqcmodel_settings.qh"
-       #include "../common/teams.qh"
-
-       #include "../csqcmodellib/cl_model.qh"
-       #include "../csqcmodellib/cl_player.qh"
-       #include "../csqcmodellib/interpolate.qh"
-
-       #include "../warpzonelib/mathlib.qh"
-
-       .float death_time;
-       .int modelflags;
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
-
+#include "csqcmodel_hooks.qh"
+
+#include "defs.qh"
+#include "gibs.qh"
+#include "main.qh"
+#include "miscfunctions.qh"
+#include "player_skeleton.qh"
+#include "sortlist.qh"
+#include "../client/autocvars.qh"
+#include "../client/weapons/projectile.qh"
+#include "../common/animdecide.qh"
+#include "../common/csqcmodel_settings.qh"
+#include "../common/teams.qh"
+#include "../csqcmodellib/cl_model.qh"
+#include "../csqcmodellib/cl_player.qh"
+#include "../csqcmodellib/interpolate.qh"
+#include "../warpzonelib/mathlib.qh"
+
+.float death_time;
+.int modelflags;
 
 void CSQCModel_Hook_PreDraw(bool isplayer);
 

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 112b1ad8dad31a6c828bc3fd66a958b7fbf5ec25..c962777c91d2ae434fcc944f9feeaf527fddd381 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -1,19 +1,16 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../common/constants.qh"
-       #include "../common/util.qh"
-       #include "../common/deathtypes.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "vehicles/vehicles.qh"
-       #include "autocvars.qh"
-       #include "defs.qh"
-       #include "damage.qh"
-       #include "gibs.qh"
-       #include "movetypes.qh"
-       #include "prandom.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "damage.qh"
+
+#include "autocvars.qh"
+#include "defs.qh"
+#include "gibs.qh"
+#include "movetypes.qh"
+#include "prandom.qh"
+#include "vehicles/vehicles.qh"
+#include "../common/constants.qh"
+#include "../common/deathtypes.qh"
+#include "../common/util.qh"
+#include "../common/weapons/weapons.qh"
+#include "../dpdefs/csprogsdefs.qh"
 
 .entity tag_entity;
 

diff --git a/qcsrc/client/effects.qc b/qcsrc/client/effects.qc
index 95623505b83e297d2a7e63e12a4f78e378838d5b..aa34ae22ed4ac677fd1c8f0f21cabc934aa11c03 100644 (file)
--- a/qcsrc/client/effects.qc
+++ b/qcsrc/client/effects.qc
@@ -1,9 +1,7 @@
-#if defined(CSQC)
-    #include "../dpdefs/csprogsdefs.qh"
-    #include "autocvars.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "effects.qh"
+
+#include "autocvars.qh"
+#include "../dpdefs/csprogsdefs.qh"
 
 /*
 .vector fx_start;

diff --git a/qcsrc/client/hook.qc b/qcsrc/client/hook.qc
index 226934edbd733126eeff1a54055ea471410f2e3f..0631de62652823b7410222d661d5065ae84f1d67 100644 (file)
--- a/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@ -7,9 +7,9 @@
 #include "miscfunctions.qh"
 #include "noise.qh"
 #include "../common/teams.qh"
+#include "../csqcmodellib/interpolate.qh"
 #include "../warpzonelib/common.qh"
 #include "../warpzonelib/mathlib.qh"
-#include "../csqcmodellib/interpolate.qh"
 
 entityclass(Hook)
 class(Hook) .float HookType; // ENT_CLIENT_*

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 6a2101fc777dbd0da522b070fdfa9b49dddf7af0..6a66edfb22243d10d58450baaef548039b7cbe86 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -1,14 +1,12 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "defs.qh"
-       #include "miscfunctions.qh"
-       #include "../dpdefs/keycodes.qh"
-       #include "../common/constants.qh"
-       #include "autocvars.qh"
-       #include "hud.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "hud_config.qh"
+
+#include "autocvars.qh"
+#include "defs.qh"
+#include "hud.qh"
+#include "miscfunctions.qh"
+#include "../common/constants.qh"
+#include "../dpdefs/csprogsdefs.qh"
+#include "../dpdefs/keycodes.qh"
 
 
 #define HUD_Write(s) fputs(fh, s)

diff --git a/qcsrc/client/laser.qc b/qcsrc/client/laser.qc
index ae4f6c277fb3fcfcd51b6a52c05e4df74ef9b3c4..f3d60d54c874fb193ab5581b420a013c89242b3d 100644 (file)
--- a/qcsrc/client/laser.qc
+++ b/qcsrc/client/laser.qc
@@ -1,13 +1,11 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../common/buffs.qh"
-       #include "../csqcmodellib/interpolate.qh"
-       #include "hook.qh"
-       #include "main.qh"
-       #include "../csqcmodellib/cl_model.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "laser.qh"
+
+#include "hook.qh"
+#include "main.qh"
+#include "../common/buffs.qh"
+#include "../csqcmodellib/cl_model.qh"
+#include "../csqcmodellib/interpolate.qh"
+#include "../dpdefs/csprogsdefs.qh"
 
 
 // a laser goes from origin in direction angles

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index fc78f3a80f4db48feb7e879058d42fd00d156f00..f16e85ecc36f3d71581413f6397cd9ebad393ad0 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -6,46 +6,39 @@
 #include "defs.qh"
 #include "effects.qh"
 #include "gibs.qh"
+#include "hook.qh"
 #include "hud.qh"
 #include "hud_config.qh"
-#include "hook.qh"
 #include "laser.qh"
 #include "mapvoting.qh"
+#include "miscfunctions.qh"
 #include "modeleffects.qh"
 #include "particles.qh"
+#include "prandom.qh"
 #include "scoreboard.qh"
 #include "shownames.qh"
 #include "sortlist.qh"
 #include "target_music.qh"
 #include "tturrets.qh"
 #include "tuba.qh"
+#include "vehicles/vehicles.qh"
 #include "wall.qh"
 #include "waypointsprites.qh"
-#include "miscfunctions.qh"
-#include "prandom.qh"
-
-#include "vehicles/vehicles.qh"
-
 #include "weapons/projectile.qh"
-
-#include "../server/vehicles/bumblebee.qh"
-#include "../server/t_items.qh"
-
 #include "../common/buffs.qh"
 #include "../common/deathtypes.qh"
 #include "../common/mapinfo.qh"
-#include "../common/notifications.qh"
+#include "../common/monsters/monsters.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/monsters/monsters.qh"
-#include "../common/nades.qh"
-
 #include "../csqcmodellib/cl_model.qh"
 #include "../csqcmodellib/interpolate.qh"
-
+#include "../server/t_items.qh"
+#include "../server/vehicles/bumblebee.qh"
 #include "../warpzonelib/client.qh"
 
 // --------------------------------------------------------------------------

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index a4a4b687f9921ef430f086b472e464016c7ff0fa..9b2191bc4ef86ac6db9c082b49837bbff80b0b6d 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -1,14 +1,14 @@
 #include "mapvoting.qh"
-#include "hud.qh"
-#include "../dpdefs/keycodes.qh"
+
 #include "autocvars.qh"
 #include "defs.qh"
+#include "hud.qh"
 #include "main.qh"
-#include "../common/mapinfo.qh"
 #include "miscfunctions.qh"
 #include "scoreboard.qh"
-
+#include "../common/mapinfo.qh"
 #include "../common/util.qh"
+#include "../dpdefs/keycodes.qh"
 
 string MapVote_FormatMapItem(int id, string map, float _count, float maxwidth, vector fontsize)
 {

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 70ec94db4683167f83ecb7865edb9293db85ce3c..d6aa38e04358323f6ac4caf3f9e5f6bef65c6af1 100644 (file)
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -1,16 +1,16 @@
 #include "miscfunctions.qh"
 
-#include "../common/teams.qh"
-#include "../common/urllib.qh"
-#include "../common/util.qh"
-#include "../common/command/generic.qh"
-#include "../csqcmodellib/cl_model.qh"
-#include "../warpzonelib/mathlib.qh"
 #include "autocvars.qh"
 #include "defs.qh"
 #include "hud.qh"
 #include "main.qh"
 #include "sortlist.qh"
+#include "../common/command/generic.qh"
+#include "../common/teams.qh"
+#include "../common/urllib.qh"
+#include "../common/util.qh"
+#include "../csqcmodellib/cl_model.qh"
+#include "../warpzonelib/mathlib.qh"
 
 void AuditLists()
 {

diff --git a/qcsrc/client/movetypes.qc b/qcsrc/client/movetypes.qc
index 2f62ae6dcf77741849bde451f5a5cc8189a9f415..6ffba0f13cc69d98f23c96e043f89c235bdd8b58 100644 (file)
--- a/qcsrc/client/movetypes.qc
+++ b/qcsrc/client/movetypes.qc
@@ -1,14 +1,11 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "defs.qh"
-       #include "../common/stats.qh"
-       #include "../common/util.qh"
-       #include "movetypes.qh"
-       #include "../csqcmodellib/common.qh"
-       #include "../server/t_items.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "movetypes.qh"
+
+#include "defs.qh"
+#include "../common/stats.qh"
+#include "../common/util.qh"
+#include "../csqcmodellib/common.qh"
+#include "../dpdefs/csprogsdefs.qh"
+#include "../server/t_items.qh"
 
 
 const int MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE = 4;

diff --git a/qcsrc/client/noise.qc b/qcsrc/client/noise.qc
index 5b64d6873dd8da68c9aa19d2a4224a509fd80e4b..1896801fb5ceff8056b47a4ee9d895a214fd3c65 100644 (file)
--- a/qcsrc/client/noise.qc
+++ b/qcsrc/client/noise.qc
@@ -1,6 +1,7 @@
+#include "noise.qh"
+
 #if defined(CSQC)
        #include "../dpdefs/csprogsdefs.qh"
-       #include "noise.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
 #endif

diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc
index 25fc5da2942264695b26e02bdeffbb74365650a1..334487c6bab0c15b6cf956b0b6b3f0f3316922dd 100644 (file)
--- a/qcsrc/client/particles.qc
+++ b/qcsrc/client/particles.qc
@@ -1,10 +1,10 @@
 #include "particles.qh"
 
-#include "../common/util.qh"
 #include "autocvars.qh"
 #include "bgmscript.qh"
 #include "main.qh"
 #include "../common/stats.qh"
+#include "../common/util.qh"
 #include "../warpzonelib/common.qh"
 
 void Draw_PointParticles()

diff --git a/qcsrc/client/prandom.qc b/qcsrc/client/prandom.qc
index 935f1421ed1379f26ce486ce56747fc8cf80385c..181300934e1459e77b43c1a3c83f74d6997549ac 100644 (file)
--- a/qcsrc/client/prandom.qc
+++ b/qcsrc/client/prandom.qc
@@ -1,10 +1,7 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "prandom.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "prandom.qh"
+
+#include "../dpdefs/csprogsdefs.qh"
+#include "../warpzonelib/mathlib.qh"
 
 // prandom - PREDICTABLE random number generator (not seeded yet)
 

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index f80da18d67309ace7482be0dd4ac37ac784cd1c0..7ca2e54c4dc019add35453a95dd5f40c8a1dc20b 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -11,8 +11,8 @@ damage.qc
 effects.qc
 gibs.qc
 hook.qc
-hud_config.qc
 hud.qc
+hud_config.qc
 laser.qc
 main.qc
 mapvoting.qc

diff --git a/qcsrc/client/rubble.qc b/qcsrc/client/rubble.qc
index c09dd18aed4ed8bfe1cc3cc78256e869489efcc1..4e32c0c45490fc9451c17504c5bafb7483368701 100644 (file)
--- a/qcsrc/client/rubble.qc
+++ b/qcsrc/client/rubble.qc
@@ -1,8 +1,4 @@
-#if defined(CSQC)
-       #include "rubble.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "rubble.qh"
 
 // LordHavoc: rewrote this file, it was really bad code
 

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 9f0db018dd3fbe2139e3db8a3dd190bc1857ee04..e31656ac20588074dfe12eb04cf788f10eeb1eb0 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1,17 +1,17 @@
 #include "scoreboard.qh"
 
 #include "autocvars.qh"
+#include "defs.qh"
+#include "hud.qh"
+#include "main.qh"
 #include "miscfunctions.qh"
+#include "sortlist.qh"
 #include "../common/constants.qh"
 #include "../common/counting.qh"
 #include "../common/mapinfo.qh"
 #include "../common/stats.qh"
 #include "../common/teams.qh"
 #include "../common/util.qh"
-#include "defs.qh"
-#include "hud.qh"
-#include "main.qh"
-#include "sortlist.qh"
 
 float scoreboard_alpha_bg;
 float scoreboard_alpha_fg;

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 7fe0e49a7cadf4a86a7feb4020ea1cf1ea3bd109..28b04b1d2ec7ccbba12bfa85c9494b7bdc10d96d 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -1,19 +1,16 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "defs.qh"
-       #include "../common/constants.qh"
-       #include "../common/teams.qh"
-       #include "../common/util.qh"
-       #include "../common/mapinfo.qh"
-       #include "autocvars.qh"
-       #include "main.qh"
-       #include "../csqcmodellib/cl_model.qh"
-       #include "shownames.qh"
-       #include "hud.qh"
-       #include "miscfunctions.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "shownames.qh"
+
+#include "autocvars.qh"
+#include "defs.qh"
+#include "hud.qh"
+#include "main.qh"
+#include "miscfunctions.qh"
+#include "../common/constants.qh"
+#include "../common/mapinfo.qh"
+#include "../common/teams.qh"
+#include "../common/util.qh"
+#include "../csqcmodellib/cl_model.qh"
+#include "../dpdefs/csprogsdefs.qh"
 
 
 // self.isactive = player is in range and coordinates/status (health and armor) are up to date

diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc
index 989bca3aed718a9ffc31068763bf35d07a072f7d..25ce2deb53d019c7607bafef456ee02abb47dbf9 100644 (file)
--- a/qcsrc/client/target_music.qc
+++ b/qcsrc/client/target_music.qc
@@ -3,8 +3,8 @@
 #include "autocvars.qh"
 #include "defs.qh"
 #include "main.qh"
-#include "../common/util.qh"
 #include "../common/constants.qh"
+#include "../common/util.qh"
 #include "../warpzonelib/common.qh"
 
 .string noise;

diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc
index 88b4339fbf917c16cfbb68e1484abc8310e9ac34..3ea3a757c3d6eaf76ac62e59386928e9f8ea63da 100644 (file)
--- a/qcsrc/client/teamradar.qc
+++ b/qcsrc/client/teamradar.qc
@@ -1,15 +1,12 @@
-#if defined(CSQC)
-       #include "autocvars.qh"
-       #include "defs.qh"
-       #include "hud.qh"
-       #include "main.qh"
-       #include "miscfunctions.qh"
-       #include "teamradar.qh"
-       #include "../common/util.qh"
-       #include "../csqcmodellib/interpolate.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "teamradar.qh"
+
+#include "autocvars.qh"
+#include "defs.qh"
+#include "hud.qh"
+#include "main.qh"
+#include "miscfunctions.qh"
+#include "../common/util.qh"
+#include "../csqcmodellib/interpolate.qh"
 
 float vlen2d(vector v)
 {

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 9fb1b38bfca1bbae35d600f1f53eff31b932a504..22bacdcac767e6e8315a65139d3f224b2a0b2445 100644 (file)
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -2,14 +2,13 @@
 
 #include "autocvars.qh"
 #include "defs.qh"
-#include "main.qh"
 #include "hud.qh"
+#include "main.qh"
 #include "miscfunctions.qh"
-#include "waypointsprites.qh"
 #include "movetypes.qh"
 #include "prandom.qh"
 #include "teamradar.qh"
-
+#include "waypointsprites.qh"
 #include "../common/teams.qh"
 #include "../server/movelib.qh"
 #include "../warpzonelib/anglestransform.qh"

diff --git a/qcsrc/client/vehicles/vehicles.qc b/qcsrc/client/vehicles/vehicles.qc
index 012f05ead8ce3231b96b23263ebe9668a10ac6f7..1cc907296980976bdfdcdd51287cfec7c029edd9 100644 (file)
--- a/qcsrc/client/vehicles/vehicles.qc
+++ b/qcsrc/client/vehicles/vehicles.qc
@@ -1,19 +1,20 @@
-#include "../../dpdefs/csprogsdefs.qh"
-#include "../../common/constants.qh"
-#include "../../common/stats.qh"
-#include "../../common/util.qh"
-#include "../../common/buffs.qh"
-#include "../../csqcmodellib/cl_model.qh"
-#include "../../server/t_items.qh"
+#include "vehicles.qh"
+
+#include "../autocvars.qh"
 #include "../defs.qh"
+#include "../main.qh"
 #include "../miscfunctions.qh"
 #include "../movetypes.qh"
-#include "../scoreboard.qh"
-#include "../autocvars.qh"
 #include "../movetypes.qh"
 #include "../prandom.qh"
-#include "../main.qh"
-#include "vehicles.qh"
+#include "../scoreboard.qh"
+#include "../../common/buffs.qh"
+#include "../../common/constants.qh"
+#include "../../common/stats.qh"
+#include "../../common/util.qh"
+#include "../../csqcmodellib/cl_model.qh"
+#include "../../dpdefs/csprogsdefs.qh"
+#include "../../server/t_items.qh"
 
 .float cnt;
 

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 0188dd7c8d61df5f4d105d601a9f5bb7f3dd19bc..8167cb1bd9709ceb017b3e78c5550a030f24e0f4 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -1,34 +1,30 @@
-#if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qh"
-       #include "defs.qh"
-       #include "../common/constants.qh"
-       #include "../common/stats.qh"
-       #include "../warpzonelib/mathlib.qh"
-       #include "../warpzonelib/common.qh"
-       #include "../warpzonelib/client.qh"
-       #include "../common/teams.qh"
-       #include "../common/util.qh"
-       #include "../common/nades.qh"
-       #include "../common/weapons/weapons.qh"
-       #include "../common/mapinfo.qh"
-       #include "autocvars.qh"
-       #include "announcer.qh"
-       #include "hud.qh"
-       #include "hud_config.qh"
-       #include "hook.qh"
-       #include "mapvoting.qh"
-       #include "miscfunctions.qh"
-       #include "scoreboard.qh"
-       #include "shownames.qh"
-       #include "target_music.qh"
-       #include "noise.qh"
-       #include "main.qh"
-       #include "waypointsprites.qh"
-       #include "vehicles/vehicles.qh"
-       #include "../csqcmodellib/cl_player.qh"
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "announcer.qh"
+#include "autocvars.qh"
+#include "defs.qh"
+#include "hook.qh"
+#include "hud.qh"
+#include "hud_config.qh"
+#include "main.qh"
+#include "mapvoting.qh"
+#include "miscfunctions.qh"
+#include "noise.qh"
+#include "scoreboard.qh"
+#include "shownames.qh"
+#include "target_music.qh"
+#include "vehicles/vehicles.qh"
+#include "waypointsprites.qh"
+#include "../common/constants.qh"
+#include "../common/mapinfo.qh"
+#include "../common/nades.qh"
+#include "../common/stats.qh"
+#include "../common/teams.qh"
+#include "../common/util.qh"
+#include "../common/weapons/weapons.qh"
+#include "../csqcmodellib/cl_player.qh"
+#include "../dpdefs/csprogsdefs.qh"
+#include "../warpzonelib/client.qh"
+#include "../warpzonelib/common.qh"
+#include "../warpzonelib/mathlib.qh"
 
 entity porto;
 vector polyline[16];

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index e8a2311cde2acb665bfd52b59cead02f070683fc..0da47f97b22c13d636b2a28552afbd72f3496138 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -1,13 +1,14 @@
+#include "projectile.qh"
+
+#include "../autocvars.qh"
+#include "../defs.qh"
+#include "../main.qh"
+#include "../movetypes.qh"
 #include "../../common/constants.qh"
 #include "../../common/nades.qh"
 #include "../../common/util.qh"
 #include "../../csqcmodellib/interpolate.qh"
 #include "../../warpzonelib/anglestransform.qh"
-#include "../autocvars.qh"
-#include "../defs.qh"
-#include "../main.qh"
-#include "../movetypes.qh"
-#include "projectile.qh"
 
 .float alpha;
 .float scale;

diff --git a/qcsrc/test/compilationunit.sh b/qcsrc/test/compilationunit.sh
index b976a4df41245971cbe266bcc77c74f2bc98454f..fb893848f529de814751cd43932cf9d4294f401f 100755 (executable)
--- a/qcsrc/test/compilationunit.sh
+++ b/qcsrc/test/compilationunit.sh
@@ -3,18 +3,16 @@ set -eu
 cd "$(dirname "$0")"
 cd ..
 
-export QCC=../../../gmqcc/gmqcc
+declare QCC=../../../gmqcc/gmqcc
 
 function check() {
   declare -l base="$1"
   declare -la predefs=("${!2}")
-  find "$base" -type f -name '*.qc' -print0 | while IFS= read -r -d '' file; do
+  find "$base" -type f -name '*.qc' -print0 | sort -z | while IFS= read -r -d '' file; do
     echo "$file"
-    ${QCC} -std=gmqcc -fftepp ${predefs[@]} "$file" >/dev/null
+    ${QCC} -std=gmqcc -fftepp -fftepp-predefs -futf8 -O3 "${predefs[@]}" "$file" >/dev/null
   done
 }
 
-# TODO: `sort -V` all the includes
-
 clientdefs=("-DCSQC" "common/util-pre.qh" "dpdefs/csprogsdefs.qh")
 check client clientdefs[@]