From 1a366da10ff6cc0740b9c7754cc0d8c0fac356a4 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 16 Oct 2020 22:12:54 +1000 Subject: [PATCH] Sort most common includes alphabetically --- qcsrc/common/animdecide.qc | 14 +++-- qcsrc/common/campaign_file.qc | 5 +- qcsrc/common/campaign_setup.qc | 5 +- qcsrc/common/command/generic.qc | 32 +++++------ qcsrc/common/command/markup.qc | 3 +- qcsrc/common/command/rpn.qc | 3 +- qcsrc/common/ent_cs.qc | 13 +++-- qcsrc/common/mapinfo.qc | 8 +-- qcsrc/common/mapobjects/models.qc | 13 ++--- qcsrc/common/mapobjects/platforms.qc | 1 + qcsrc/common/mapobjects/subs.qc | 1 + qcsrc/common/mapobjects/teleporters.qc | 30 +++++----- qcsrc/common/minigames/cl_minigames_hud.qc | 8 +-- qcsrc/common/minigames/sv_minigames.qc | 2 +- qcsrc/common/monsters/sv_monsters.qc | 40 ++++++------- qcsrc/common/monsters/sv_spawn.qc | 16 +++--- qcsrc/common/monsters/sv_spawner.qc | 5 +- qcsrc/common/notifications/all.qc | 3 +- qcsrc/common/physics/movetypes/follow.qc | 1 + qcsrc/common/physics/movetypes/push.qc | 1 + qcsrc/common/physics/movetypes/step.qc | 1 + qcsrc/common/physics/movetypes/walk.qc | 1 + qcsrc/common/physics/player.qc | 10 ++-- qcsrc/common/playerstats.qc | 19 ++++--- qcsrc/common/sounds/all.qc | 2 +- qcsrc/common/turrets/cl_turrets.qc | 1 + qcsrc/common/turrets/config.qc | 3 +- qcsrc/common/turrets/sv_turrets.qc | 3 +- qcsrc/common/util.qc | 22 ++++---- qcsrc/common/vehicles/cl_vehicles.qc | 1 + qcsrc/common/vehicles/sv_vehicles.qc | 8 +-- qcsrc/common/vehicles/vehicle/racer.qc | 3 +- qcsrc/common/viewloc.qc | 6 +- qcsrc/common/weapons/all.qc | 66 +++++++++++----------- qcsrc/common/weapons/config.qc | 3 +- qcsrc/common/weapons/weapon/arc.qc | 2 +- 36 files changed, 188 insertions(+), 167 deletions(-) diff --git a/qcsrc/common/animdecide.qc b/qcsrc/common/animdecide.qc index 136e4d436..f759ef444 100644 --- a/qcsrc/common/animdecide.qc +++ b/qcsrc/common/animdecide.qc @@ -1,11 +1,13 @@ #include "animdecide.qh" -#include - -#if defined(SVQC) - #include "util.qh" - #include - #include +#if defined(CSQC) + #include +#elif defined(MENUQC) +#elif defined(SVQC) + #include + #include + #include + #include #endif bool monsters_animoverride(entity this) diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc index 8bac6f35e..65e1917fa 100644 --- a/qcsrc/common/campaign_file.qc +++ b/qcsrc/common/campaign_file.qc @@ -1,9 +1,10 @@ #include "campaign_file.qh" + #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "util.qh" - #include "campaign_common.qh" + #include + #include #endif // CampaignFileLoad(offset, n) diff --git a/qcsrc/common/campaign_setup.qc b/qcsrc/common/campaign_setup.qc index 258d47f45..8be208980 100644 --- a/qcsrc/common/campaign_setup.qc +++ b/qcsrc/common/campaign_setup.qc @@ -1,9 +1,10 @@ #include "campaign_setup.qh" + #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "campaign_common.qh" - #include "mapinfo.qh" + #include + #include #endif void CampaignSetup(int n) diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 7ef5cb64e..e354a9a59 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -1,24 +1,24 @@ #include "generic.qh" -#include "_mod.qh" -#include "reg.qh" -#include "markup.qh" -#include "rpn.qh" - -#include "../mapinfo.qh" - -#ifdef GAMEQC - #include "../notifications/all.qh" -#endif - -#ifdef CSQC +#if defined(CSQC) #include -#endif - -#ifdef SVQC - #include + #include + #include + #include + #include + #include + #include +#elif defined(MENUQC) +#elif defined(SVQC) + #include + #include + #include + #include + #include + #include #include #include + #include #endif // ========================================================= diff --git a/qcsrc/common/command/markup.qc b/qcsrc/common/command/markup.qc index 1618f6e08..bd1b79cbf 100644 --- a/qcsrc/common/command/markup.qc +++ b/qcsrc/common/command/markup.qc @@ -1,5 +1,6 @@ #include "markup.qh" -#include "command.qh" + +#include // ========================================================= // Markup chat characters command code, reworked by Samual diff --git a/qcsrc/common/command/rpn.qc b/qcsrc/common/command/rpn.qc index 6d2ffe43b..467768269 100644 --- a/qcsrc/common/command/rpn.qc +++ b/qcsrc/common/command/rpn.qc @@ -1,5 +1,6 @@ #include "rpn.qh" -#include "command.qh" + +#include // ======================================== diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc index 4ef6b2f79..95e4af419 100644 --- a/qcsrc/common/ent_cs.qc +++ b/qcsrc/common/ent_cs.qc @@ -1,8 +1,13 @@ #include "ent_cs.qh" -#include -#include -#ifdef SVQC -#include + +#if defined(CSQC) + #include + #include +#elif defined(MENUQC) +#elif defined(SVQC) + #include + #include + #include #endif REGISTRY(EntCSProps, BITS(16) - 1) diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index b8071fab6..1b3fa8faf 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -1,11 +1,11 @@ #include "mapinfo.qh" #if defined(CSQC) - #include "util.qh" - #include + #include + #include #elif defined(MENUQC) #elif defined(SVQC) - #include "util.qh" - #include + #include + #include #endif #ifdef MENUQC diff --git a/qcsrc/common/mapobjects/models.qc b/qcsrc/common/mapobjects/models.qc index 9ba1dcdf6..4d4ccc8dd 100644 --- a/qcsrc/common/mapobjects/models.qc +++ b/qcsrc/common/mapobjects/models.qc @@ -1,14 +1,13 @@ #include "models.qh" #ifdef SVQC -#include -#include -#include -#include "subs.qh" -#include "triggers.qh" -#include "bgmscript.qh" - #include +#include +#include +#include +#include +#include +#include #include void g_model_setcolormaptoactivator(entity this, entity actor, entity trigger) diff --git a/qcsrc/common/mapobjects/platforms.qc b/qcsrc/common/mapobjects/platforms.qc index aae20894d..afd349673 100644 --- a/qcsrc/common/mapobjects/platforms.qc +++ b/qcsrc/common/mapobjects/platforms.qc @@ -1,4 +1,5 @@ #include "platforms.qh" + void generic_plat_blocked(entity this, entity blocker) { #ifdef SVQC diff --git a/qcsrc/common/mapobjects/subs.qc b/qcsrc/common/mapobjects/subs.qc index 4195abfc6..847deca6e 100644 --- a/qcsrc/common/mapobjects/subs.qc +++ b/qcsrc/common/mapobjects/subs.qc @@ -1,4 +1,5 @@ #include "subs.qh" + void SUB_NullThink(entity this) { } void SUB_CalcMoveDone(entity this); diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc index 1b0c9a3da..7c0ea1225 100644 --- a/qcsrc/common/mapobjects/teleporters.qc +++ b/qcsrc/common/mapobjects/teleporters.qc @@ -3,21 +3,21 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include - #include - #include - #include "../constants.qh" - #include "../mapobjects/subs.qh" - #include "../util.qh" - #include - #include - #include - #include - #include "../deathtypes/all.qh" - #include "../turrets/sv_turrets.qh" - #include "../vehicles/all.qh" - #include - #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include #endif #ifdef SVQC diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc index 14dac4e88..2fdc52fcb 100644 --- a/qcsrc/common/minigames/cl_minigames_hud.qc +++ b/qcsrc/common/minigames/cl_minigames_hud.qc @@ -2,15 +2,13 @@ #include #include +#include +#include #include - -#include "minigames.qh" +#include .vector colormod; -#include -#include - void HUD_MinigameBoard_Export(int fh) { // allow saving cvars that aesthetically change the panel into hud skin files diff --git a/qcsrc/common/minigames/sv_minigames.qc b/qcsrc/common/minigames/sv_minigames.qc index 2e793d10a..21f81055a 100644 --- a/qcsrc/common/minigames/sv_minigames.qc +++ b/qcsrc/common/minigames/sv_minigames.qc @@ -1,6 +1,6 @@ #include "sv_minigames.qh" -#include "minigames.qh" +#include #include void player_clear_minigame(entity player) diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index 2e109e906..7ddc7b10c 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -1,31 +1,31 @@ #include "sv_monsters.qh" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "../constants.qh" -#include "../teams.qh" -#include "../util.qh" -#include "all.qh" -#include "../physics/movelib.qh" -#include "../weapons/_mod.qh" #include -#include -#include -#include -#include "../deathtypes/all.qh" -#include -#include -#include -#include "../turrets/sv_turrets.qh" -#include "../turrets/util.qh" -#include "../vehicles/all.qh" #include #include #include -#include -#include -#include "../mapobjects/triggers.qh" -#include +#include +#include +#include #include +#include #include void monsters_setstatus(entity this) diff --git a/qcsrc/common/monsters/sv_spawn.qc b/qcsrc/common/monsters/sv_spawn.qc index 4cdfb24e4..54fc4154e 100644 --- a/qcsrc/common/monsters/sv_spawn.qc +++ b/qcsrc/common/monsters/sv_spawn.qc @@ -1,15 +1,17 @@ #include "sv_spawn.qh" + #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../util.qh" - #include "all.qh" - #include "sv_monsters.qh" - #include - #include - #include - #include + #include + #include + #include + #include + #include + #include + #include #endif + entity spawnmonster (entity e, string monster, Monster monster_id, entity spawnedby, entity own, vector orig, bool respwn, bool removeifinvalid, int moveflag) { e.spawnflags = MONSTERFLAG_SPAWNED; diff --git a/qcsrc/common/monsters/sv_spawner.qc b/qcsrc/common/monsters/sv_spawner.qc index 98222f6ac..a430951da 100644 --- a/qcsrc/common/monsters/sv_spawner.qc +++ b/qcsrc/common/monsters/sv_spawner.qc @@ -1,6 +1,7 @@ -#include "sv_monsters.qh" #include "sv_spawner.qh" -#include "sv_spawn.qh" + +#include +#include void spawner_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index e2c1e185a..372d963d7 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -1,4 +1,5 @@ #include "all.qh" + #if defined(CSQC) #include #elif defined(MENUQC) @@ -8,8 +9,8 @@ #include #include #include - #include #include + #include #endif // ================================================ diff --git a/qcsrc/common/physics/movetypes/follow.qc b/qcsrc/common/physics/movetypes/follow.qc index 300906905..ba33be986 100644 --- a/qcsrc/common/physics/movetypes/follow.qc +++ b/qcsrc/common/physics/movetypes/follow.qc @@ -1,4 +1,5 @@ #include "follow.qh" + void _Movetype_Physics_Follow(entity this) // SV_Physics_Follow { entity e = this.aiment; diff --git a/qcsrc/common/physics/movetypes/push.qc b/qcsrc/common/physics/movetypes/push.qc index 66ff42a69..1b654b59c 100644 --- a/qcsrc/common/physics/movetypes/push.qc +++ b/qcsrc/common/physics/movetypes/push.qc @@ -1,4 +1,5 @@ #include "push.qh" + void _Movetype_PushMove(entity this, float dt) // SV_PushMove { if(this.velocity == '0 0 0' && this.avelocity == '0 0 0') diff --git a/qcsrc/common/physics/movetypes/step.qc b/qcsrc/common/physics/movetypes/step.qc index 30ebe6afa..d68981076 100644 --- a/qcsrc/common/physics/movetypes/step.qc +++ b/qcsrc/common/physics/movetypes/step.qc @@ -1,4 +1,5 @@ #include "step.qh" + void _Movetype_Physics_Step(entity this, float dt) // SV_Physics_Step { if(IS_ONGROUND(this)) diff --git a/qcsrc/common/physics/movetypes/walk.qc b/qcsrc/common/physics/movetypes/walk.qc index cd33ebc82..d74837927 100644 --- a/qcsrc/common/physics/movetypes/walk.qc +++ b/qcsrc/common/physics/movetypes/walk.qc @@ -1,4 +1,5 @@ #include "walk.qh" + void _Movetype_Physics_Walk(entity this, float dt) // SV_WalkMove { // if frametime is 0 (due to client sending the same timestamp twice), don't move diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index 7afc039e1..69dcf56b0 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -1,12 +1,12 @@ #include "player.qh" -#include "../mapobjects/_mod.qh" -#include "../viewloc.qh" -#ifdef SVQC +#include +#include -#include +#ifdef SVQC #include -#include "../mapobjects/trigger/viewloc.qh" +#include +#include // client side physics bool Physics_Valid(string thecvar) diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index cbf7f9eef..4a7f35203 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -1,17 +1,18 @@ #include "playerstats.qh" + #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "constants.qh" - #include "util.qh" - #include - #include - #include "../server/anticheat.qh" - #include - #include - #include "../server/scores.qh" + #include + #include + #include + #include + #include + #include + #include + #include + #include #include - #include "../server/weapons/accuracy.qh" #endif #ifdef SVQC diff --git a/qcsrc/common/sounds/all.qc b/qcsrc/common/sounds/all.qc index fdbf41180..c6418674c 100644 --- a/qcsrc/common/sounds/all.qc +++ b/qcsrc/common/sounds/all.qc @@ -1,6 +1,6 @@ #include "all.qh" -#ifdef SVQC +#ifdef SVQC #include bool autocvar_bot_sound_monopoly; diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc index fca9f7f23..84812fc46 100644 --- a/qcsrc/common/turrets/cl_turrets.qc +++ b/qcsrc/common/turrets/cl_turrets.qc @@ -1,4 +1,5 @@ #include "cl_turrets.qh" + void turret_remove(entity this) { delete(this.tur_head); diff --git a/qcsrc/common/turrets/config.qc b/qcsrc/common/turrets/config.qc index 8ecd190e3..14c51be66 100644 --- a/qcsrc/common/turrets/config.qc +++ b/qcsrc/common/turrets/config.qc @@ -1,9 +1,10 @@ #include "config.qh" + #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) + #include #include - #include "all.qh" #endif // ========================== diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc index 98490610a..1900def33 100644 --- a/qcsrc/common/turrets/sv_turrets.qc +++ b/qcsrc/common/turrets/sv_turrets.qc @@ -1,12 +1,13 @@ #include "sv_turrets.qh" + #ifdef SVQC +#include #include #include #include #include #include #include -#include // Generic aiming vector turret_aim_generic(entity this) diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 35eff3f9c..ee0eb1058 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -1,22 +1,22 @@ #include "util.qh" #if defined(CSQC) - #include "constants.qh" #include - #include "mapinfo.qh" - #include "notifications/all.qh" - #include "scores.qh" - #include + #include + #include #include + #include + #include + #include #elif defined(MENUQC) #elif defined(SVQC) - #include "constants.qh" - #include - #include "notifications/all.qh" - #include + #include + #include #include - #include "scores.qh" - #include "mapinfo.qh" + #include + #include + #include + #include #endif #ifdef SVQC diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc index 667c1f75a..86e718bbb 100644 --- a/qcsrc/common/vehicles/cl_vehicles.qc +++ b/qcsrc/common/vehicles/cl_vehicles.qc @@ -1,4 +1,5 @@ #include "cl_vehicles.qh" + const string vCROSS_BURST = "gfx/vehicles/crosshair_burst.tga"; const string vCROSS_DROP = "gfx/vehicles/crosshair_drop.tga"; const string vCROSS_GUIDE = "gfx/vehicles/crosshair_guide.tga"; diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc index dbfeb1240..5bc834a00 100644 --- a/qcsrc/common/vehicles/sv_vehicles.qc +++ b/qcsrc/common/vehicles/sv_vehicles.qc @@ -1,14 +1,14 @@ #include "sv_vehicles.qh" -#include -#include -#include -#include #include #include #include #include +#include +#include +#include #include +#include bool SendAuxiliaryXhair(entity this, entity to, int sf) { diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc index 423eefd19..606d11505 100644 --- a/qcsrc/common/vehicles/vehicle/racer.qc +++ b/qcsrc/common/vehicles/vehicle/racer.qc @@ -2,13 +2,12 @@ #if defined(SVQC) #include + #include #endif #ifdef GAMEQC #ifdef SVQC -#include - bool autocvar_g_vehicle_racer = true; float autocvar_g_vehicle_racer_thinkrate = 0.05; // TODO: any higher causes it to sink in liquids diff --git a/qcsrc/common/viewloc.qc b/qcsrc/common/viewloc.qc index 58cf42161..92e739542 100644 --- a/qcsrc/common/viewloc.qc +++ b/qcsrc/common/viewloc.qc @@ -1,12 +1,12 @@ #include "viewloc.qh" -#include "util.qh" #if defined(CSQC) - #include "constants.qh" + #include + #include #elif defined(MENUQC) #elif defined(SVQC) - #include #include + #include #endif // client movement diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 7c089ba70..b0e3b58a0 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -3,54 +3,52 @@ #define WEAPONS_ALL_C #if defined(CSQC) - #include "../constants.qh" - #include "../stats.qh" - #include - #include - #include - #include "../util.qh" #include - #include "../deathtypes/all.qh" - #include - #include "../physics/movetypes/movetypes.qh" #include + #include + #include + #include + #include + #include + #include + #include #include + #include + #include + #include + #include #elif defined(MENUQC) + #include #elif defined(SVQC) + #include + #include #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include #include #include - #include #include - #include "../constants.qh" - #include "../stats.qh" - #include "../teams.qh" - #include - #include "../monsters/_mod.qh" - #include "config.qh" - #include - #include - #include - #include + #include #include - #include "../notifications/all.qh" - #include "../deathtypes/all.qh" - #include - #include "../mapinfo.qh" #include - #include + #include + #include + #include #include -#include -#endif -#ifdef GAMEQC - #include "calculations.qc" -#endif -#ifdef SVQC - #include "config.qc" + #include + #include + #include #endif -#include "weapon/_mod.inc" - // WEAPON PLUGIN SYSTEM diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc index ab0fa0c17..596540dd3 100644 --- a/qcsrc/common/weapons/config.qc +++ b/qcsrc/common/weapons/config.qc @@ -1,9 +1,10 @@ #include "config.qh" + #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) #include - #include "all.qh" + #include #endif // ========================== diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc index f5888c50a..d19057654 100644 --- a/qcsrc/common/weapons/weapon/arc.qc +++ b/qcsrc/common/weapons/weapon/arc.qc @@ -1,8 +1,8 @@ #include "arc.qh" #ifdef SVQC -#include #include +#include bool W_Arc_Beam_Send(entity this, entity to, int sf) { -- 2.39.2