From 7efb90d3f4f1f73636764ee8ab21f667d1b49a05 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sat, 2 May 2015 13:14:27 +1000 Subject: [PATCH] Sort #includes --- qcsrc/client/announcer.qc | 18 +++++----- qcsrc/client/bgmscript.qc | 17 ++++----- qcsrc/client/casings.qc | 28 +++++++-------- qcsrc/client/command/cl_cmd.qc | 6 ++-- qcsrc/client/csqcmodel_hooks.qc | 47 +++++++++++------------- qcsrc/client/damage.qc | 29 +++++++-------- qcsrc/client/effects.qc | 10 +++--- qcsrc/client/hook.qc | 2 +- qcsrc/client/hud_config.qc | 20 +++++------ qcsrc/client/laser.qc | 18 +++++----- qcsrc/client/main.qc | 25 +++++-------- qcsrc/client/mapvoting.qc | 8 ++--- qcsrc/client/miscfunctions.qc | 12 +++---- qcsrc/client/movetypes.qc | 19 +++++----- qcsrc/client/noise.qc | 3 +- qcsrc/client/particles.qc | 2 +- qcsrc/client/prandom.qc | 11 +++--- qcsrc/client/progs.src | 2 +- qcsrc/client/rubble.qc | 6 +--- qcsrc/client/scoreboard.qc | 8 ++--- qcsrc/client/shownames.qc | 29 +++++++-------- qcsrc/client/target_music.qc | 2 +- qcsrc/client/teamradar.qc | 21 +++++------ qcsrc/client/tturrets.qc | 5 ++- qcsrc/client/vehicles/vehicles.qc | 23 ++++++------ qcsrc/client/view.qc | 58 ++++++++++++++---------------- qcsrc/client/weapons/projectile.qc | 11 +++--- qcsrc/test/compilationunit.sh | 8 ++--- 28 files changed, 199 insertions(+), 249 deletions(-) diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index 116dba7d3..5de03953c 100644 --- 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 7bc3b9b1a..70c4bab3f 100644 --- 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 97f627123..c80c9bc6a 100644 --- 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 8b5fc5153..5a69fbbd0 100644 --- 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 987d166fe..2337266cf 100644 --- 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 112b1ad8d..c962777c9 100644 --- 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 95623505b..aa34ae22e 100644 --- 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 226934edb..0631de626 100644 --- 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 6a2101fc7..6a66edfb2 100644 --- 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 ae4f6c277..f3d60d54c 100644 --- 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 fc78f3a80..f16e85ecc 100644 --- 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 a4a4b687f..9b2191bc4 100644 --- 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 70ec94db4..d6aa38e04 100644 --- 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 2f62ae6dc..6ffba0f13 100644 --- 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 5b64d6873..1896801fb 100644 --- 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 25fc5da29..334487c6b 100644 --- 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 935f1421e..181300934 100644 --- 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 f80da18d6..7ca2e54c4 100644 --- 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 c09dd18ae..4e32c0c45 100644 --- 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 9f0db018d..e31656ac2 100644 --- 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 7fe0e49a7..28b04b1d2 100644 --- 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 989bca3ae..25ce2deb5 100644 --- 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 88b4339fb..3ea3a757c 100644 --- 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 9fb1b38bf..22bacdcac 100644 --- 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 012f05ead..1cc907296 100644 --- 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 0188dd7c8..8167cb1bd 100644 --- 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 e8a2311cd..0da47f97b 100644 --- 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 b976a4df4..fb893848f 100755 --- 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[@] -- 2.39.2