From 65e9ceb03c81bc515d090a54f65dd620c8c6dc43 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 21 Aug 2016 16:01:29 +1000 Subject: [PATCH] Ensure headers are always #included --- qcsrc/common/campaign_file.qc | 1 + qcsrc/common/campaign_setup.qc | 1 + qcsrc/common/command/generic.qc | 1 + qcsrc/common/command/markup.qc | 2 +- qcsrc/common/command/rpn.qc | 2 +- qcsrc/common/effects/effectinfo.qc | 1 + qcsrc/common/effects/qc/casings.qc | 1 + .../gamemodes/gamemode/onslaught/sv_onslaught.qc | 1 + qcsrc/common/mapinfo.qc | 3 +-- qcsrc/common/minigames/minigame/bd.qc | 1 + qcsrc/common/minigames/minigame/c4.qc | 1 + qcsrc/common/minigames/minigame/nmm.qc | 1 + qcsrc/common/minigames/minigame/pong.qc | 1 + qcsrc/common/minigames/minigame/pp.qc | 1 + qcsrc/common/minigames/minigame/ps.qc | 1 + qcsrc/common/minigames/minigame/snake.qc | 1 + qcsrc/common/minigames/minigame/ttt.qc | 1 + qcsrc/common/minigames/sv_minigames.qc | 1 + qcsrc/common/monsters/all.qc | 1 + qcsrc/common/monsters/spawn.qc | 1 + .../common/mutators/mutator/overkill/overkill.qc | 1 + qcsrc/common/notifications/all.qc | 2 +- qcsrc/common/physics/movetypes/follow.qc | 1 + qcsrc/common/physics/movetypes/movetypes.qc | 2 +- qcsrc/common/physics/movetypes/step.qc | 1 + qcsrc/common/physics/movetypes/toss.qc | 1 + qcsrc/common/physics/movetypes/walk.qc | 1 + qcsrc/common/playerstats.qc | 2 +- qcsrc/common/sounds/all.qc | 1 + qcsrc/common/triggers/func/bobbing.qc | 1 + qcsrc/common/triggers/func/breakable.qc | 1 + qcsrc/common/triggers/func/button.qc | 1 + qcsrc/common/triggers/func/conveyor.qc | 1 + qcsrc/common/triggers/func/door.qc | 1 + qcsrc/common/triggers/func/door_rotating.qc | 1 + qcsrc/common/triggers/func/door_secret.qc | 1 + qcsrc/common/triggers/func/fourier.qc | 1 + qcsrc/common/triggers/func/ladder.qc | 1 + qcsrc/common/triggers/func/pendulum.qc | 1 + qcsrc/common/triggers/func/plat.qc | 1 + qcsrc/common/triggers/func/pointparticles.qc | 1 + qcsrc/common/triggers/func/rainsnow.qc | 1 + qcsrc/common/triggers/func/rotating.qc | 1 + qcsrc/common/triggers/func/stardust.qc | 1 + qcsrc/common/triggers/func/train.qc | 1 + qcsrc/common/triggers/func/vectormamamam.qc | 1 + qcsrc/common/triggers/misc/corner.qc | 1 + qcsrc/common/triggers/misc/follow.qc | 1 + qcsrc/common/triggers/misc/include.qc | 1 + qcsrc/common/triggers/misc/laser.qc | 1 + qcsrc/common/triggers/misc/teleport_dest.qc | 1 + qcsrc/common/triggers/platforms.qc | 1 + qcsrc/common/triggers/subs.qc | 1 + qcsrc/common/triggers/target/changelevel.qc | 1 + qcsrc/common/triggers/target/location.qc | 1 + qcsrc/common/triggers/target/music.qc | 1 + qcsrc/common/triggers/target/spawn.qc | 1 + qcsrc/common/triggers/target/speaker.qc | 1 + qcsrc/common/triggers/target/voicescript.qc | 1 + qcsrc/common/triggers/trigger/counter.qc | 1 + qcsrc/common/triggers/trigger/delay.qc | 1 + qcsrc/common/triggers/trigger/disablerelay.qc | 1 + qcsrc/common/triggers/trigger/flipflop.qc | 1 + qcsrc/common/triggers/trigger/gamestart.qc | 1 + qcsrc/common/triggers/trigger/gravity.qc | 1 + qcsrc/common/triggers/trigger/heal.qc | 1 + qcsrc/common/triggers/trigger/hurt.qc | 1 + qcsrc/common/triggers/trigger/impulse.qc | 1 + qcsrc/common/triggers/trigger/jumppads.qc | 1 + qcsrc/common/triggers/trigger/keylock.qc | 1 + qcsrc/common/triggers/trigger/magicear.qc | 1 + qcsrc/common/triggers/trigger/monoflop.qc | 1 + qcsrc/common/triggers/trigger/multi.qc | 1 + qcsrc/common/triggers/trigger/multivibrator.qc | 1 + qcsrc/common/triggers/trigger/relay.qc | 1 + .../common/triggers/trigger/relay_activators.qc | 1 + qcsrc/common/triggers/trigger/relay_if.qc | 1 + qcsrc/common/triggers/trigger/relay_teamcheck.qc | 1 + qcsrc/common/triggers/trigger/secret.qc | 2 +- qcsrc/common/triggers/trigger/swamp.qc | 1 + qcsrc/common/triggers/trigger/teleport.qc | 1 + qcsrc/common/triggers/trigger/viewloc.qc | 1 + qcsrc/common/triggers/triggers.qc | 1 + qcsrc/common/turrets/checkpoint.qc | 1 + qcsrc/common/turrets/cl_turrets.qc | 1 + qcsrc/common/turrets/config.qc | 1 + qcsrc/common/turrets/sv_turrets.qc | 1 + qcsrc/common/turrets/targettrigger.qc | 1 + qcsrc/common/turrets/turrets.qc | 1 + qcsrc/common/turrets/util.qc | 1 + qcsrc/common/vehicles/all.qc | 3 +-- qcsrc/common/vehicles/cl_vehicles.qc | 1 + qcsrc/common/vehicles/vehicles.qc | 1 + qcsrc/common/viewloc.qc | 1 + qcsrc/common/weapons/all.qc | 3 +-- qcsrc/common/weapons/config.qc | 2 +- qcsrc/common/weapons/weapon/arc.qc | 1 + qcsrc/common/weapons/weapon/blaster.qc | 1 + qcsrc/common/weapons/weapon/crylink.qc | 1 + qcsrc/common/weapons/weapon/devastator.qc | 1 + qcsrc/common/weapons/weapon/electro.qc | 1 + qcsrc/common/weapons/weapon/fireball.qc | 1 + qcsrc/common/weapons/weapon/hagar.qc | 1 + qcsrc/common/weapons/weapon/hlac.qc | 1 + qcsrc/common/weapons/weapon/hook.qc | 1 + qcsrc/common/weapons/weapon/machinegun.qc | 1 + qcsrc/common/weapons/weapon/minelayer.qc | 1 + qcsrc/common/weapons/weapon/mortar.qc | 1 + qcsrc/common/weapons/weapon/porto.qc | 1 + qcsrc/common/weapons/weapon/rifle.qc | 1 + qcsrc/common/weapons/weapon/seeker.qc | 1 + qcsrc/common/weapons/weapon/shockwave.qc | 1 + qcsrc/common/weapons/weapon/shotgun.qc | 1 + qcsrc/common/weapons/weapon/tuba.qc | 1 + qcsrc/common/weapons/weapon/vaporizer.qc | 1 + qcsrc/common/weapons/weapon/vortex.qc | 1 + qcsrc/tools/headerstyle.sh | 16 ++-------------- 117 files changed, 118 insertions(+), 27 deletions(-) diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc index a8bbe8e85..af81942a2 100644 --- a/qcsrc/common/campaign_file.qc +++ b/qcsrc/common/campaign_file.qc @@ -1,3 +1,4 @@ +#include "campaign_file.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/common/campaign_setup.qc b/qcsrc/common/campaign_setup.qc index 8c20c755c..258d47f45 100644 --- a/qcsrc/common/campaign_setup.qc +++ b/qcsrc/common/campaign_setup.qc @@ -1,3 +1,4 @@ +#include "campaign_setup.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index bce5ea8e8..49a9d1309 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -1,3 +1,4 @@ +#include "generic.qh" #include "_mod.qh" #include "reg.qh" diff --git a/qcsrc/common/command/markup.qc b/qcsrc/common/command/markup.qc index 583c61e55..95a3b53c5 100644 --- a/qcsrc/common/command/markup.qc +++ b/qcsrc/common/command/markup.qc @@ -1,5 +1,5 @@ -#include "command.qh" #include "markup.qh" +#include "command.qh" // ========================================================= // Markup chat characters command code, reworked by Samual diff --git a/qcsrc/common/command/rpn.qc b/qcsrc/common/command/rpn.qc index 12bb99d1d..f88bf635e 100644 --- a/qcsrc/common/command/rpn.qc +++ b/qcsrc/common/command/rpn.qc @@ -1,5 +1,5 @@ -#include "command.qh" #include "rpn.qh" +#include "command.qh" // ======================================== diff --git a/qcsrc/common/effects/effectinfo.qc b/qcsrc/common/effects/effectinfo.qc index cf6d5fca9..f662aee7b 100644 --- a/qcsrc/common/effects/effectinfo.qc +++ b/qcsrc/common/effects/effectinfo.qc @@ -1,3 +1,4 @@ +#include "effectinfo.qh" #define EFFECTINFO_PARSER(on, MY) \ on(type, MY(type) \ ,{ demand(n == 1 && "type"); MY(type) = strzone(argv(1)); \ diff --git a/qcsrc/common/effects/qc/casings.qc b/qcsrc/common/effects/qc/casings.qc index f92df7cd0..d0befbb7e 100644 --- a/qcsrc/common/effects/qc/casings.qc +++ b/qcsrc/common/effects/qc/casings.qc @@ -1,3 +1,4 @@ +#include "casings.qh" #ifdef SVQC void SpawnCasing(vector vel, float randomvel, vector ang, vector avel, float randomavel, int casingtype, entity casingowner, .entity weaponentity); #endif diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc index f57625607..570bc3645 100644 --- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc +++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc @@ -1,3 +1,4 @@ +#include "sv_onslaught.qh" #include "sv_controlpoint.qh" #include "sv_generator.qh" diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index cffa34893..f3213527b 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -1,13 +1,12 @@ +#include "mapinfo.qh" #if defined(CSQC) #include "../client/defs.qh" #include "util.qh" #include - #include "mapinfo.qh" #elif defined(MENUQC) #elif defined(SVQC) #include "util.qh" #include - #include "mapinfo.qh" #endif // generic string stuff diff --git a/qcsrc/common/minigames/minigame/bd.qc b/qcsrc/common/minigames/minigame/bd.qc index 041e56339..a0a93b191 100644 --- a/qcsrc/common/minigames/minigame/bd.qc +++ b/qcsrc/common/minigames/minigame/bd.qc @@ -1,3 +1,4 @@ +#include "bd.qh" REGISTER_MINIGAME(bd, "Bulldozer"); const int BD_TURN_MOVE = 0x0100; // player must move the bulldozer diff --git a/qcsrc/common/minigames/minigame/c4.qc b/qcsrc/common/minigames/minigame/c4.qc index 497ef2afc..86c9f1889 100644 --- a/qcsrc/common/minigames/minigame/c4.qc +++ b/qcsrc/common/minigames/minigame/c4.qc @@ -1,3 +1,4 @@ +#include "c4.qh" REGISTER_MINIGAME(c4, "Connect Four"); const float C4_TURN_PLACE = 0x0100; // player has to place a piece on the board diff --git a/qcsrc/common/minigames/minigame/nmm.qc b/qcsrc/common/minigames/minigame/nmm.qc index 78fb30f1d..bdb02ab96 100644 --- a/qcsrc/common/minigames/minigame/nmm.qc +++ b/qcsrc/common/minigames/minigame/nmm.qc @@ -1,3 +1,4 @@ +#include "nmm.qh" REGISTER_MINIGAME(nmm, "Nine Men's Morris"); const int NMM_TURN_PLACE = 0x0100; // player has to place a piece on the board diff --git a/qcsrc/common/minigames/minigame/pong.qc b/qcsrc/common/minigames/minigame/pong.qc index d535b8c85..3574b9f74 100644 --- a/qcsrc/common/minigames/minigame/pong.qc +++ b/qcsrc/common/minigames/minigame/pong.qc @@ -1,3 +1,4 @@ +#include "pong.qh" REGISTER_MINIGAME(pong, "Pong"); // minigame flags diff --git a/qcsrc/common/minigames/minigame/pp.qc b/qcsrc/common/minigames/minigame/pp.qc index f9e0f79b9..668988387 100644 --- a/qcsrc/common/minigames/minigame/pp.qc +++ b/qcsrc/common/minigames/minigame/pp.qc @@ -1,3 +1,4 @@ +#include "pp.qh" REGISTER_MINIGAME(pp, "Push-Pull"); const int PP_TURN_PLACE = 0x0100; // player has to place a piece on the board diff --git a/qcsrc/common/minigames/minigame/ps.qc b/qcsrc/common/minigames/minigame/ps.qc index c9ef8bd67..b2831744d 100644 --- a/qcsrc/common/minigames/minigame/ps.qc +++ b/qcsrc/common/minigames/minigame/ps.qc @@ -1,3 +1,4 @@ +#include "ps.qh" REGISTER_MINIGAME(ps, "Peg Solitaire"); const float PS_TURN_MOVE = 0x0100; // player has to click on a piece on the board diff --git a/qcsrc/common/minigames/minigame/snake.qc b/qcsrc/common/minigames/minigame/snake.qc index 4248d589a..d5f0ea078 100644 --- a/qcsrc/common/minigames/minigame/snake.qc +++ b/qcsrc/common/minigames/minigame/snake.qc @@ -1,3 +1,4 @@ +#include "snake.qh" REGISTER_MINIGAME(snake, "Snake"); // SNAAAAKE const float SNAKE_TURN_MOVE = 0x0100; // the snake is moving, player must control it diff --git a/qcsrc/common/minigames/minigame/ttt.qc b/qcsrc/common/minigames/minigame/ttt.qc index 9c0ece163..9db2201a3 100644 --- a/qcsrc/common/minigames/minigame/ttt.qc +++ b/qcsrc/common/minigames/minigame/ttt.qc @@ -1,3 +1,4 @@ +#include "ttt.qh" REGISTER_MINIGAME(ttt, "Tic Tac Toe"); const int TTT_TURN_PLACE = 0x0100; // player has to place a piece on the board diff --git a/qcsrc/common/minigames/sv_minigames.qc b/qcsrc/common/minigames/sv_minigames.qc index da04340a6..5f1d1280b 100644 --- a/qcsrc/common/minigames/sv_minigames.qc +++ b/qcsrc/common/minigames/sv_minigames.qc @@ -1,3 +1,4 @@ +#include "sv_minigames.qh" #include "minigames.qh" void player_clear_minigame(entity player) diff --git a/qcsrc/common/monsters/all.qc b/qcsrc/common/monsters/all.qc index fa3f65193..a262a2345 100644 --- a/qcsrc/common/monsters/all.qc +++ b/qcsrc/common/monsters/all.qc @@ -1,3 +1,4 @@ +#include "all.qh" #ifndef MONSTERS_ALL_C #define MONSTERS_ALL_C diff --git a/qcsrc/common/monsters/spawn.qc b/qcsrc/common/monsters/spawn.qc index 23fc845ac..6c72ada30 100644 --- a/qcsrc/common/monsters/spawn.qc +++ b/qcsrc/common/monsters/spawn.qc @@ -1,3 +1,4 @@ +#include "spawn.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qc b/qcsrc/common/mutators/mutator/overkill/overkill.qc index e69de29bb..3cb64ce92 100644 --- a/qcsrc/common/mutators/mutator/overkill/overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/overkill.qc @@ -0,0 +1 @@ +#include "overkill.qh" diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index 5d8e9341c..acd570d0b 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -1,3 +1,4 @@ +#include "all.qh" #if defined(CSQC) #include #elif defined(MENUQC) @@ -7,7 +8,6 @@ #include #include #include - #include "all.qh" #include #endif diff --git a/qcsrc/common/physics/movetypes/follow.qc b/qcsrc/common/physics/movetypes/follow.qc index 515208987..300906905 100644 --- a/qcsrc/common/physics/movetypes/follow.qc +++ b/qcsrc/common/physics/movetypes/follow.qc @@ -1,3 +1,4 @@ +#include "follow.qh" void _Movetype_Physics_Follow(entity this) // SV_Physics_Follow { entity e = this.aiment; diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc index 1810fb841..8ac17d883 100644 --- a/qcsrc/common/physics/movetypes/movetypes.qc +++ b/qcsrc/common/physics/movetypes/movetypes.qc @@ -1,10 +1,10 @@ +#include "movetypes.qh" #include "../player.qh" #if defined(CSQC) #include #include #include - #include "movetypes.qh" #include #include #elif defined(MENUQC) diff --git a/qcsrc/common/physics/movetypes/step.qc b/qcsrc/common/physics/movetypes/step.qc index 7eb553bfa..a41269f79 100644 --- a/qcsrc/common/physics/movetypes/step.qc +++ b/qcsrc/common/physics/movetypes/step.qc @@ -1,3 +1,4 @@ +#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/toss.qc b/qcsrc/common/physics/movetypes/toss.qc index 4821e34f6..498852135 100644 --- a/qcsrc/common/physics/movetypes/toss.qc +++ b/qcsrc/common/physics/movetypes/toss.qc @@ -1,3 +1,4 @@ +#include "toss.qh" #include "../player.qh" void _Movetype_Physics_Toss(entity this, float dt) // SV_Physics_Toss diff --git a/qcsrc/common/physics/movetypes/walk.qc b/qcsrc/common/physics/movetypes/walk.qc index bf58ca582..c20e82e83 100644 --- a/qcsrc/common/physics/movetypes/walk.qc +++ b/qcsrc/common/physics/movetypes/walk.qc @@ -1,3 +1,4 @@ +#include "walk.qh" void _Movetype_Physics_Walk(entity this, float dt) // SV_WalkMove { vector stepnormal = '0 0 0'; diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index 56ffccea7..4dab61164 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -1,3 +1,4 @@ +#include "playerstats.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) @@ -6,7 +7,6 @@ #include #include "../server/weapons/accuracy.qh" #include "../server/defs.qh" - #include "playerstats.qh" #include "../server/scores.qh" #endif diff --git a/qcsrc/common/sounds/all.qc b/qcsrc/common/sounds/all.qc index 9096dddfa..b3bdf99e9 100644 --- a/qcsrc/common/sounds/all.qc +++ b/qcsrc/common/sounds/all.qc @@ -1,3 +1,4 @@ +#include "all.qh" #ifdef SVQC bool autocvar_bot_sound_monopoly; diff --git a/qcsrc/common/triggers/func/bobbing.qc b/qcsrc/common/triggers/func/bobbing.qc index 094673b5b..b7034939a 100644 --- a/qcsrc/common/triggers/func/bobbing.qc +++ b/qcsrc/common/triggers/func/bobbing.qc @@ -1,3 +1,4 @@ +#include "bobbing.qh" #ifdef SVQC .float height; void func_bobbing_controller_think(entity this) diff --git a/qcsrc/common/triggers/func/breakable.qc b/qcsrc/common/triggers/func/breakable.qc index 29d6c6a26..2b7a1155f 100644 --- a/qcsrc/common/triggers/func/breakable.qc +++ b/qcsrc/common/triggers/func/breakable.qc @@ -1,3 +1,4 @@ +#include "breakable.qh" #ifdef SVQC #include diff --git a/qcsrc/common/triggers/func/button.qc b/qcsrc/common/triggers/func/button.qc index b186066e6..916ff8ca1 100644 --- a/qcsrc/common/triggers/func/button.qc +++ b/qcsrc/common/triggers/func/button.qc @@ -1,3 +1,4 @@ +#include "button.qh" #ifdef SVQC // button and multiple button diff --git a/qcsrc/common/triggers/func/conveyor.qc b/qcsrc/common/triggers/func/conveyor.qc index 73ceb6394..4902deea5 100644 --- a/qcsrc/common/triggers/func/conveyor.qc +++ b/qcsrc/common/triggers/func/conveyor.qc @@ -1,3 +1,4 @@ +#include "conveyor.qh" REGISTER_NET_LINKED(ENT_CLIENT_CONVEYOR) void conveyor_think(entity this) diff --git a/qcsrc/common/triggers/func/door.qc b/qcsrc/common/triggers/func/door.qc index 706784eda..8a8280260 100644 --- a/qcsrc/common/triggers/func/door.qc +++ b/qcsrc/common/triggers/func/door.qc @@ -1,3 +1,4 @@ +#include "door.qh" /* Doors are similar to buttons, but can spawn a fat trigger field around them diff --git a/qcsrc/common/triggers/func/door_rotating.qc b/qcsrc/common/triggers/func/door_rotating.qc index 31171899f..2c72dc9cf 100644 --- a/qcsrc/common/triggers/func/door_rotating.qc +++ b/qcsrc/common/triggers/func/door_rotating.qc @@ -1,3 +1,4 @@ +#include "door_rotating.qh" #ifdef SVQC /*QUAKED spawnfunc_func_door_rotating (0 .5 .8) ? START_OPEN BIDIR DOOR_DONT_LINK BIDIR_IN_DOWN x TOGGLE X_AXIS Y_AXIS if two doors touch, they are assumed to be connected and operate as a unit. diff --git a/qcsrc/common/triggers/func/door_secret.qc b/qcsrc/common/triggers/func/door_secret.qc index 600949fe5..efe997c85 100644 --- a/qcsrc/common/triggers/func/door_secret.qc +++ b/qcsrc/common/triggers/func/door_secret.qc @@ -1,3 +1,4 @@ +#include "door_secret.qh" #ifdef SVQC void fd_secret_move1(entity this); void fd_secret_move2(entity this); diff --git a/qcsrc/common/triggers/func/fourier.qc b/qcsrc/common/triggers/func/fourier.qc index 52eab115a..600f39373 100644 --- a/qcsrc/common/triggers/func/fourier.qc +++ b/qcsrc/common/triggers/func/fourier.qc @@ -1,3 +1,4 @@ +#include "fourier.qh" #ifdef SVQC /*QUAKED spawnfunc_func_fourier (0 .5 .8) ? Brush model that moves in a pattern of added up sine waves, can be used e.g. for circular motions. diff --git a/qcsrc/common/triggers/func/ladder.qc b/qcsrc/common/triggers/func/ladder.qc index ae9160dfd..5ff2bdcc2 100644 --- a/qcsrc/common/triggers/func/ladder.qc +++ b/qcsrc/common/triggers/func/ladder.qc @@ -1,3 +1,4 @@ +#include "ladder.qh" REGISTER_NET_LINKED(ENT_CLIENT_LADDER) void func_ladder_touch(entity this, entity toucher) diff --git a/qcsrc/common/triggers/func/pendulum.qc b/qcsrc/common/triggers/func/pendulum.qc index 05f7b75a6..946712509 100644 --- a/qcsrc/common/triggers/func/pendulum.qc +++ b/qcsrc/common/triggers/func/pendulum.qc @@ -1,3 +1,4 @@ +#include "pendulum.qh" #ifdef SVQC .float freq; void func_pendulum_controller_think(entity this) diff --git a/qcsrc/common/triggers/func/plat.qc b/qcsrc/common/triggers/func/plat.qc index 396636e8c..5d90924da 100644 --- a/qcsrc/common/triggers/func/plat.qc +++ b/qcsrc/common/triggers/func/plat.qc @@ -1,3 +1,4 @@ +#include "plat.qh" REGISTER_NET_LINKED(ENT_CLIENT_PLAT) #ifdef SVQC diff --git a/qcsrc/common/triggers/func/pointparticles.qc b/qcsrc/common/triggers/func/pointparticles.qc index 0cf0615da..a0773f249 100644 --- a/qcsrc/common/triggers/func/pointparticles.qc +++ b/qcsrc/common/triggers/func/pointparticles.qc @@ -1,3 +1,4 @@ +#include "pointparticles.qh" REGISTER_NET_LINKED(ENT_CLIENT_POINTPARTICLES) #ifdef SVQC diff --git a/qcsrc/common/triggers/func/rainsnow.qc b/qcsrc/common/triggers/func/rainsnow.qc index cc7dc0922..c8b4e2924 100644 --- a/qcsrc/common/triggers/func/rainsnow.qc +++ b/qcsrc/common/triggers/func/rainsnow.qc @@ -1,3 +1,4 @@ +#include "rainsnow.qh" REGISTER_NET_LINKED(ENT_CLIENT_RAINSNOW) #ifdef SVQC diff --git a/qcsrc/common/triggers/func/rotating.qc b/qcsrc/common/triggers/func/rotating.qc index 22f3dedea..1adaea91d 100644 --- a/qcsrc/common/triggers/func/rotating.qc +++ b/qcsrc/common/triggers/func/rotating.qc @@ -1,3 +1,4 @@ +#include "rotating.qh" #ifdef SVQC void func_rotating_setactive(entity this, int astate) { diff --git a/qcsrc/common/triggers/func/stardust.qc b/qcsrc/common/triggers/func/stardust.qc index db5081b61..9c2fba8ad 100644 --- a/qcsrc/common/triggers/func/stardust.qc +++ b/qcsrc/common/triggers/func/stardust.qc @@ -1,3 +1,4 @@ +#include "stardust.qh" #ifdef SVQC spawnfunc(func_stardust) { diff --git a/qcsrc/common/triggers/func/train.qc b/qcsrc/common/triggers/func/train.qc index 247bfb0fc..dd9eaac86 100644 --- a/qcsrc/common/triggers/func/train.qc +++ b/qcsrc/common/triggers/func/train.qc @@ -1,3 +1,4 @@ +#include "train.qh" .float train_wait_turning; void train_next(entity this); #ifdef SVQC diff --git a/qcsrc/common/triggers/func/vectormamamam.qc b/qcsrc/common/triggers/func/vectormamamam.qc index accdc9983..18d58d649 100644 --- a/qcsrc/common/triggers/func/vectormamamam.qc +++ b/qcsrc/common/triggers/func/vectormamamam.qc @@ -1,3 +1,4 @@ +#include "vectormamamam.qh" #ifdef SVQC // reusing some fields havocbots declared .entity wp00, wp01, wp02, wp03; diff --git a/qcsrc/common/triggers/misc/corner.qc b/qcsrc/common/triggers/misc/corner.qc index 38772a295..dcc44710f 100644 --- a/qcsrc/common/triggers/misc/corner.qc +++ b/qcsrc/common/triggers/misc/corner.qc @@ -1,3 +1,4 @@ +#include "corner.qh" REGISTER_NET_LINKED(ENT_CLIENT_CORNER) #ifdef SVQC diff --git a/qcsrc/common/triggers/misc/follow.qc b/qcsrc/common/triggers/misc/follow.qc index d19d9da08..63db2c18f 100644 --- a/qcsrc/common/triggers/misc/follow.qc +++ b/qcsrc/common/triggers/misc/follow.qc @@ -1,3 +1,4 @@ +#include "follow.qh" // the way this entity works makes it no use to CSQC, as it removes itself instantly #ifdef SVQC diff --git a/qcsrc/common/triggers/misc/include.qc b/qcsrc/common/triggers/misc/include.qc index 8965c6290..bbe5ce03d 100644 --- a/qcsrc/common/triggers/misc/include.qc +++ b/qcsrc/common/triggers/misc/include.qc @@ -1,3 +1,4 @@ +#include "include.qh" #include "corner.qc" #include "follow.qc" #include "laser.qc" diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc index d10ff1128..2059a8126 100644 --- a/qcsrc/common/triggers/misc/laser.qc +++ b/qcsrc/common/triggers/misc/laser.qc @@ -1,3 +1,4 @@ +#include "laser.qh" #if defined(CSQC) #include #include diff --git a/qcsrc/common/triggers/misc/teleport_dest.qc b/qcsrc/common/triggers/misc/teleport_dest.qc index ab15a6891..fc3cec863 100644 --- a/qcsrc/common/triggers/misc/teleport_dest.qc +++ b/qcsrc/common/triggers/misc/teleport_dest.qc @@ -1,3 +1,4 @@ +#include "teleport_dest.qh" REGISTER_NET_LINKED(ENT_CLIENT_TELEPORT_DEST) #ifdef SVQC diff --git a/qcsrc/common/triggers/platforms.qc b/qcsrc/common/triggers/platforms.qc index 7b9ffd9c5..10af3e194 100644 --- a/qcsrc/common/triggers/platforms.qc +++ b/qcsrc/common/triggers/platforms.qc @@ -1,3 +1,4 @@ +#include "platforms.qh" void generic_plat_blocked(entity this, entity blocker) { #ifdef SVQC diff --git a/qcsrc/common/triggers/subs.qc b/qcsrc/common/triggers/subs.qc index 66f0253d9..67eb18a67 100644 --- a/qcsrc/common/triggers/subs.qc +++ b/qcsrc/common/triggers/subs.qc @@ -1,3 +1,4 @@ +#include "subs.qh" void SUB_NullThink(entity this) { } void SUB_CalcMoveDone(entity this); diff --git a/qcsrc/common/triggers/target/changelevel.qc b/qcsrc/common/triggers/target/changelevel.qc index d4bc850de..6c006d42a 100644 --- a/qcsrc/common/triggers/target/changelevel.qc +++ b/qcsrc/common/triggers/target/changelevel.qc @@ -1,3 +1,4 @@ +#include "changelevel.qh" #ifdef SVQC .string chmap, gametype; .entity chlevel_targ; diff --git a/qcsrc/common/triggers/target/location.qc b/qcsrc/common/triggers/target/location.qc index 5a24d2c5e..5259276e4 100644 --- a/qcsrc/common/triggers/target/location.qc +++ b/qcsrc/common/triggers/target/location.qc @@ -1,3 +1,4 @@ +#include "location.qh" #ifdef SVQC void target_push_init(entity this); diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc index ff195f03f..c8e353928 100644 --- a/qcsrc/common/triggers/target/music.qc +++ b/qcsrc/common/triggers/target/music.qc @@ -1,3 +1,4 @@ +#include "music.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/triggers/target/spawn.qc index bc5271040..4eed8ef34 100644 --- a/qcsrc/common/triggers/target/spawn.qc +++ b/qcsrc/common/triggers/target/spawn.qc @@ -1,3 +1,4 @@ +#include "spawn.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/common/triggers/target/speaker.qc b/qcsrc/common/triggers/target/speaker.qc index f8f1c0ace..af327b443 100644 --- a/qcsrc/common/triggers/target/speaker.qc +++ b/qcsrc/common/triggers/target/speaker.qc @@ -1,3 +1,4 @@ +#include "speaker.qh" #ifdef SVQC // TODO add a way to do looped sounds with sound(); then complete this entity void target_speaker_use_off(entity this, entity actor, entity trigger); diff --git a/qcsrc/common/triggers/target/voicescript.qc b/qcsrc/common/triggers/target/voicescript.qc index bdf1e0f1f..fe7155cc5 100644 --- a/qcsrc/common/triggers/target/voicescript.qc +++ b/qcsrc/common/triggers/target/voicescript.qc @@ -1,3 +1,4 @@ +#include "voicescript.qh" #ifdef SVQC .entity voicescript; // attached voice script .float voicescript_index; // index of next voice, or -1 to use the randomized ones diff --git a/qcsrc/common/triggers/trigger/counter.qc b/qcsrc/common/triggers/trigger/counter.qc index a4f850ba9..8246aed7c 100644 --- a/qcsrc/common/triggers/trigger/counter.qc +++ b/qcsrc/common/triggers/trigger/counter.qc @@ -1,3 +1,4 @@ +#include "counter.qh" #ifdef SVQC void counter_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/triggers/trigger/delay.qc b/qcsrc/common/triggers/trigger/delay.qc index d6742fed3..c5049da39 100644 --- a/qcsrc/common/triggers/trigger/delay.qc +++ b/qcsrc/common/triggers/trigger/delay.qc @@ -1,3 +1,4 @@ +#include "delay.qh" #ifdef SVQC void delay_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/triggers/trigger/disablerelay.qc b/qcsrc/common/triggers/trigger/disablerelay.qc index 1d30db0e0..6154f6bf0 100644 --- a/qcsrc/common/triggers/trigger/disablerelay.qc +++ b/qcsrc/common/triggers/trigger/disablerelay.qc @@ -1,3 +1,4 @@ +#include "disablerelay.qh" #ifdef SVQC void trigger_disablerelay_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/triggers/trigger/flipflop.qc b/qcsrc/common/triggers/trigger/flipflop.qc index e4923bdf5..af212ff5a 100644 --- a/qcsrc/common/triggers/trigger/flipflop.qc +++ b/qcsrc/common/triggers/trigger/flipflop.qc @@ -1,3 +1,4 @@ +#include "flipflop.qh" #ifdef SVQC /*QUAKED spawnfunc_trigger_flipflop (.5 .5 .5) (-8 -8 -8) (8 8 8) START_ENABLED "Flip-flop" trigger gate... lets only every second trigger event through diff --git a/qcsrc/common/triggers/trigger/gamestart.qc b/qcsrc/common/triggers/trigger/gamestart.qc index 62b21e66f..72d76d183 100644 --- a/qcsrc/common/triggers/trigger/gamestart.qc +++ b/qcsrc/common/triggers/trigger/gamestart.qc @@ -1,3 +1,4 @@ +#include "gamestart.qh" #ifdef SVQC void gamestart_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/triggers/trigger/gravity.qc b/qcsrc/common/triggers/trigger/gravity.qc index 88b73c4df..3ea1562f0 100644 --- a/qcsrc/common/triggers/trigger/gravity.qc +++ b/qcsrc/common/triggers/trigger/gravity.qc @@ -1,3 +1,4 @@ +#include "gravity.qh" #ifdef SVQC .entity trigger_gravity_check; void trigger_gravity_remove(entity own) diff --git a/qcsrc/common/triggers/trigger/heal.qc b/qcsrc/common/triggers/trigger/heal.qc index 5a2bc78de..e7b309062 100644 --- a/qcsrc/common/triggers/trigger/heal.qc +++ b/qcsrc/common/triggers/trigger/heal.qc @@ -1,3 +1,4 @@ +#include "heal.qh" #ifdef SVQC .float triggerhealtime; void trigger_heal_touch(entity this, entity toucher) diff --git a/qcsrc/common/triggers/trigger/hurt.qc b/qcsrc/common/triggers/trigger/hurt.qc index 4579fd752..d0ba4ebd1 100644 --- a/qcsrc/common/triggers/trigger/hurt.qc +++ b/qcsrc/common/triggers/trigger/hurt.qc @@ -1,3 +1,4 @@ +#include "hurt.qh" #ifdef SVQC void trigger_hurt_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/triggers/trigger/impulse.qc b/qcsrc/common/triggers/trigger/impulse.qc index 43bac947e..cb9c2d293 100644 --- a/qcsrc/common/triggers/trigger/impulse.qc +++ b/qcsrc/common/triggers/trigger/impulse.qc @@ -1,3 +1,4 @@ +#include "impulse.qh" // targeted (directional) mode void trigger_impulse_touch1(entity this, entity toucher) { diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc index 519ba2691..ef13dd5be 100644 --- a/qcsrc/common/triggers/trigger/jumppads.qc +++ b/qcsrc/common/triggers/trigger/jumppads.qc @@ -1,3 +1,4 @@ +#include "jumppads.qh" // TODO: split target_push and put it in the target folder #ifdef SVQC #include "jumppads.qh" diff --git a/qcsrc/common/triggers/trigger/keylock.qc b/qcsrc/common/triggers/trigger/keylock.qc index eabb84f57..bf20d1e97 100644 --- a/qcsrc/common/triggers/trigger/keylock.qc +++ b/qcsrc/common/triggers/trigger/keylock.qc @@ -1,3 +1,4 @@ +#include "keylock.qh" /** * trigger given targets */ diff --git a/qcsrc/common/triggers/trigger/magicear.qc b/qcsrc/common/triggers/trigger/magicear.qc index 53fda30e4..065d8c932 100644 --- a/qcsrc/common/triggers/trigger/magicear.qc +++ b/qcsrc/common/triggers/trigger/magicear.qc @@ -1,3 +1,4 @@ +#include "magicear.qh" #ifdef SVQC float magicear_matched; float W_Tuba_HasPlayed(entity pl, string melody, float instrument, float ignorepitch, float mintempo, float maxtempo); diff --git a/qcsrc/common/triggers/trigger/monoflop.qc b/qcsrc/common/triggers/trigger/monoflop.qc index 018e20884..a67baca16 100644 --- a/qcsrc/common/triggers/trigger/monoflop.qc +++ b/qcsrc/common/triggers/trigger/monoflop.qc @@ -1,3 +1,4 @@ +#include "monoflop.qh" #ifdef SVQC /*QUAKED spawnfunc_trigger_monoflop (.5 .5 .5) (-8 -8 -8) (8 8 8) "Mono-flop" trigger gate... turns one trigger event into one "on" and one "off" event, separated by a delay of "wait" diff --git a/qcsrc/common/triggers/trigger/multi.qc b/qcsrc/common/triggers/trigger/multi.qc index b801e9f4f..7aa13c13e 100644 --- a/qcsrc/common/triggers/trigger/multi.qc +++ b/qcsrc/common/triggers/trigger/multi.qc @@ -1,3 +1,4 @@ +#include "multi.qh" // NOTE: also contains trigger_once at bottom #ifdef SVQC diff --git a/qcsrc/common/triggers/trigger/multivibrator.qc b/qcsrc/common/triggers/trigger/multivibrator.qc index 1a1850537..d946efe5f 100644 --- a/qcsrc/common/triggers/trigger/multivibrator.qc +++ b/qcsrc/common/triggers/trigger/multivibrator.qc @@ -1,3 +1,4 @@ +#include "multivibrator.qh" #ifdef SVQC void multivibrator_send(entity this) { diff --git a/qcsrc/common/triggers/trigger/relay.qc b/qcsrc/common/triggers/trigger/relay.qc index 1df446ba3..794f4dc11 100644 --- a/qcsrc/common/triggers/trigger/relay.qc +++ b/qcsrc/common/triggers/trigger/relay.qc @@ -1,3 +1,4 @@ +#include "relay.qh" #ifdef SVQC /*QUAKED spawnfunc_trigger_relay (.5 .5 .5) (-8 -8 -8) (8 8 8) This fixed size trigger cannot be touched, it can only be fired by other events. It can contain killtargets, targets, delays, and messages. diff --git a/qcsrc/common/triggers/trigger/relay_activators.qc b/qcsrc/common/triggers/trigger/relay_activators.qc index bbb49d0e5..d713a0583 100644 --- a/qcsrc/common/triggers/trigger/relay_activators.qc +++ b/qcsrc/common/triggers/trigger/relay_activators.qc @@ -1,3 +1,4 @@ +#include "relay_activators.qh" #ifdef SVQC void relay_activators_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/triggers/trigger/relay_if.qc b/qcsrc/common/triggers/trigger/relay_if.qc index ea90a06cb..728252c70 100644 --- a/qcsrc/common/triggers/trigger/relay_if.qc +++ b/qcsrc/common/triggers/trigger/relay_if.qc @@ -1,3 +1,4 @@ +#include "relay_if.qh" #ifdef SVQC void trigger_relay_if_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/triggers/trigger/relay_teamcheck.qc b/qcsrc/common/triggers/trigger/relay_teamcheck.qc index 2972d32bb..4f9dab7fd 100644 --- a/qcsrc/common/triggers/trigger/relay_teamcheck.qc +++ b/qcsrc/common/triggers/trigger/relay_teamcheck.qc @@ -1,3 +1,4 @@ +#include "relay_teamcheck.qh" #ifdef SVQC void trigger_relay_teamcheck_use(entity this, entity actor, entity trigger) { diff --git a/qcsrc/common/triggers/trigger/secret.qc b/qcsrc/common/triggers/trigger/secret.qc index 9260c01ac..e6e35c295 100644 --- a/qcsrc/common/triggers/trigger/secret.qc +++ b/qcsrc/common/triggers/trigger/secret.qc @@ -1,9 +1,9 @@ +#include "secret.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) #include #include - #include "secret.qh" #endif #ifdef SVQC diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc index e204d3a25..71c5247c7 100644 --- a/qcsrc/common/triggers/trigger/swamp.qc +++ b/qcsrc/common/triggers/trigger/swamp.qc @@ -1,3 +1,4 @@ +#include "swamp.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/common/triggers/trigger/teleport.qc b/qcsrc/common/triggers/trigger/teleport.qc index 69e2c49c1..05bb13c71 100644 --- a/qcsrc/common/triggers/trigger/teleport.qc +++ b/qcsrc/common/triggers/trigger/teleport.qc @@ -1,3 +1,4 @@ +#include "teleport.qh" REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_TELEPORT) #ifdef SVQC diff --git a/qcsrc/common/triggers/trigger/viewloc.qc b/qcsrc/common/triggers/trigger/viewloc.qc index f2a0e86cc..d53ac5dca 100644 --- a/qcsrc/common/triggers/trigger/viewloc.qc +++ b/qcsrc/common/triggers/trigger/viewloc.qc @@ -1,3 +1,4 @@ +#include "viewloc.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) diff --git a/qcsrc/common/triggers/triggers.qc b/qcsrc/common/triggers/triggers.qc index 81144aae7..54e1e0991 100644 --- a/qcsrc/common/triggers/triggers.qc +++ b/qcsrc/common/triggers/triggers.qc @@ -1,3 +1,4 @@ +#include "triggers.qh" void SUB_DontUseTargets(entity this, entity actor, entity trigger) { } void SUB_UseTargets(entity this, entity actor, entity trigger); diff --git a/qcsrc/common/turrets/checkpoint.qc b/qcsrc/common/turrets/checkpoint.qc index fb56d3ecc..6c246a75b 100644 --- a/qcsrc/common/turrets/checkpoint.qc +++ b/qcsrc/common/turrets/checkpoint.qc @@ -1,3 +1,4 @@ +#include "checkpoint.qh" /** turret_checkpoint **/ diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc index 29658b56b..a893b3e8a 100644 --- a/qcsrc/common/turrets/cl_turrets.qc +++ b/qcsrc/common/turrets/cl_turrets.qc @@ -1,3 +1,4 @@ +#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 f5989b48d..2b1e00c8a 100644 --- a/qcsrc/common/turrets/config.qc +++ b/qcsrc/common/turrets/config.qc @@ -1,3 +1,4 @@ +#include "config.qh" // ========================== // Turret Config Generator // ========================== diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc index a387fefc4..dabb7ee35 100644 --- a/qcsrc/common/turrets/sv_turrets.qc +++ b/qcsrc/common/turrets/sv_turrets.qc @@ -1,3 +1,4 @@ +#include "sv_turrets.qh" #ifdef SVQC #include diff --git a/qcsrc/common/turrets/targettrigger.qc b/qcsrc/common/turrets/targettrigger.qc index ca94f2b4e..f2a97d4a1 100644 --- a/qcsrc/common/turrets/targettrigger.qc +++ b/qcsrc/common/turrets/targettrigger.qc @@ -1,3 +1,4 @@ +#include "targettrigger.qh" spawnfunc(turret_targettrigger); void turret_targettrigger_touch(entity this, entity toucher); diff --git a/qcsrc/common/turrets/turrets.qc b/qcsrc/common/turrets/turrets.qc index e69de29bb..a53f85952 100644 --- a/qcsrc/common/turrets/turrets.qc +++ b/qcsrc/common/turrets/turrets.qc @@ -0,0 +1 @@ +#include "turrets.qh" diff --git a/qcsrc/common/turrets/util.qc b/qcsrc/common/turrets/util.qc index 8a6a5ee87..5fef36458 100644 --- a/qcsrc/common/turrets/util.qc +++ b/qcsrc/common/turrets/util.qc @@ -1,3 +1,4 @@ +#include "util.qh" /* * Update this.tur_shotorg by getting up2date bone info * NOTICE this func overwrites the global v_forward, v_right and v_up vectors. diff --git a/qcsrc/common/vehicles/all.qc b/qcsrc/common/vehicles/all.qc index 251df2283..4aef11cad 100644 --- a/qcsrc/common/vehicles/all.qc +++ b/qcsrc/common/vehicles/all.qc @@ -1,8 +1,7 @@ +#include "all.qh" #ifndef VEHICLES_ALL_C #define VEHICLES_ALL_C -#include "all.qh" - REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR) #if defined(SVQC) diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc index e08490976..afb48c918 100644 --- a/qcsrc/common/vehicles/cl_vehicles.qc +++ b/qcsrc/common/vehicles/cl_vehicles.qc @@ -1,3 +1,4 @@ +#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/vehicles.qc b/qcsrc/common/vehicles/vehicles.qc index e69de29bb..5e7736501 100644 --- a/qcsrc/common/vehicles/vehicles.qc +++ b/qcsrc/common/vehicles/vehicles.qc @@ -0,0 +1 @@ +#include "vehicles.qh" diff --git a/qcsrc/common/viewloc.qc b/qcsrc/common/viewloc.qc index 4b6a6997a..7d6a3818e 100644 --- a/qcsrc/common/viewloc.qc +++ b/qcsrc/common/viewloc.qc @@ -1,3 +1,4 @@ +#include "viewloc.qh" #include "util.qh" #if defined(CSQC) diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 3e90bfe15..dfdbd7656 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -1,8 +1,7 @@ +#include "all.qh" #ifndef WEAPONS_ALL_C #define WEAPONS_ALL_C -#include "all.qh" - #if defined(CSQC) #include #include "../constants.qh" diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc index 26a05d10a..4f6177b47 100644 --- a/qcsrc/common/weapons/config.qc +++ b/qcsrc/common/weapons/config.qc @@ -1,8 +1,8 @@ +#include "config.qh" #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) #include "../util.qh" - #include "config.qh" #include "all.qh" #endif diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc index fa8e83168..895d2c13b 100644 --- a/qcsrc/common/weapons/weapon/arc.qc +++ b/qcsrc/common/weapons/weapon/arc.qc @@ -1,3 +1,4 @@ +#include "arc.qh" #ifndef IMPLEMENTATION CLASS(Arc, Weapon) /* ammotype */ ATTRIB(Arc, ammo_field, .int, ammo_cells); diff --git a/qcsrc/common/weapons/weapon/blaster.qc b/qcsrc/common/weapons/weapon/blaster.qc index c5911b89f..2f24e9e25 100644 --- a/qcsrc/common/weapons/weapon/blaster.qc +++ b/qcsrc/common/weapons/weapon/blaster.qc @@ -1,3 +1,4 @@ +#include "blaster.qh" #ifndef IMPLEMENTATION CLASS(Blaster, Weapon) /* ammotype */ //ATTRIB(Blaster, ammo_field, .int, ammo_none); diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc index 1a3fb3fa4..be5b2ec28 100644 --- a/qcsrc/common/weapons/weapon/crylink.qc +++ b/qcsrc/common/weapons/weapon/crylink.qc @@ -1,3 +1,4 @@ +#include "crylink.qh" #ifndef IMPLEMENTATION CLASS(Crylink, Weapon) /* ammotype */ ATTRIB(Crylink, ammo_field, .int, ammo_cells); diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc index 9462070aa..5ffe08bad 100644 --- a/qcsrc/common/weapons/weapon/devastator.qc +++ b/qcsrc/common/weapons/weapon/devastator.qc @@ -1,3 +1,4 @@ +#include "devastator.qh" #ifndef IMPLEMENTATION CLASS(Devastator, Weapon) /* ammotype */ ATTRIB(Devastator, ammo_field, .int, ammo_rockets); diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc index aa66f50c8..bd6fb8969 100644 --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@ -1,3 +1,4 @@ +#include "electro.qh" #ifndef IMPLEMENTATION CLASS(Electro, Weapon) /* ammotype */ ATTRIB(Electro, ammo_field, .int, ammo_cells); diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc index bfc020715..db87ee445 100644 --- a/qcsrc/common/weapons/weapon/fireball.qc +++ b/qcsrc/common/weapons/weapon/fireball.qc @@ -1,3 +1,4 @@ +#include "fireball.qh" #ifndef IMPLEMENTATION CLASS(Fireball, Weapon) /* ammotype */ //ATTRIB(Fireball, ammo_field, .int, ammo_none); diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc index 72fb60db6..ece4b3589 100644 --- a/qcsrc/common/weapons/weapon/hagar.qc +++ b/qcsrc/common/weapons/weapon/hagar.qc @@ -1,3 +1,4 @@ +#include "hagar.qh" #ifndef IMPLEMENTATION CLASS(Hagar, Weapon) /* ammotype */ ATTRIB(Hagar, ammo_field, .int, ammo_rockets); diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc index 4ed2ee9f4..c77ccc98e 100644 --- a/qcsrc/common/weapons/weapon/hlac.qc +++ b/qcsrc/common/weapons/weapon/hlac.qc @@ -1,3 +1,4 @@ +#include "hlac.qh" #ifndef IMPLEMENTATION CLASS(HLAC, Weapon) /* ammotype */ ATTRIB(HLAC, ammo_field, .int, ammo_cells); diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc index 6409e94ff..b2c317459 100644 --- a/qcsrc/common/weapons/weapon/hook.qc +++ b/qcsrc/common/weapons/weapon/hook.qc @@ -1,3 +1,4 @@ +#include "hook.qh" #ifndef IMPLEMENTATION CLASS(Hook, Weapon) /* ammotype */ ATTRIB(Hook, ammo_field, .int, ammo_fuel); diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc index 96c873a07..81da28ddb 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qc +++ b/qcsrc/common/weapons/weapon/machinegun.qc @@ -1,3 +1,4 @@ +#include "machinegun.qh" #ifndef IMPLEMENTATION CLASS(MachineGun, Weapon) /* ammotype */ ATTRIB(MachineGun, ammo_field, .int, ammo_nails); diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc index c47838842..a3b356954 100644 --- a/qcsrc/common/weapons/weapon/minelayer.qc +++ b/qcsrc/common/weapons/weapon/minelayer.qc @@ -1,3 +1,4 @@ +#include "minelayer.qh" #ifndef IMPLEMENTATION CLASS(MineLayer, Weapon) /* ammotype */ ATTRIB(MineLayer, ammo_field, .int, ammo_rockets); diff --git a/qcsrc/common/weapons/weapon/mortar.qc b/qcsrc/common/weapons/weapon/mortar.qc index f3613e554..81be15654 100644 --- a/qcsrc/common/weapons/weapon/mortar.qc +++ b/qcsrc/common/weapons/weapon/mortar.qc @@ -1,3 +1,4 @@ +#include "mortar.qh" #ifndef IMPLEMENTATION CLASS(Mortar, Weapon) /* ammotype */ ATTRIB(Mortar, ammo_field, .int, ammo_rockets); diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc index 98bebaac6..8a689e051 100644 --- a/qcsrc/common/weapons/weapon/porto.qc +++ b/qcsrc/common/weapons/weapon/porto.qc @@ -1,3 +1,4 @@ +#include "porto.qh" #ifndef IMPLEMENTATION CLASS(PortoLaunch, Weapon) /* ammotype */ ATTRIB(PortoLaunch, ammo_field, .int, ammo_none); diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc index 3eee2d4ba..478a31525 100644 --- a/qcsrc/common/weapons/weapon/rifle.qc +++ b/qcsrc/common/weapons/weapon/rifle.qc @@ -1,3 +1,4 @@ +#include "rifle.qh" #ifndef IMPLEMENTATION CLASS(Rifle, Weapon) /* ammotype */ ATTRIB(Rifle, ammo_field, .int, ammo_nails); diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc index 4b9e2d81a..850659069 100644 --- a/qcsrc/common/weapons/weapon/seeker.qc +++ b/qcsrc/common/weapons/weapon/seeker.qc @@ -1,3 +1,4 @@ +#include "seeker.qh" #ifndef IMPLEMENTATION CLASS(Seeker, Weapon) /* ammotype */ ATTRIB(Seeker, ammo_field, .int, ammo_rockets); diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc index ae44e907e..28cbe69bb 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qc +++ b/qcsrc/common/weapons/weapon/shockwave.qc @@ -1,3 +1,4 @@ +#include "shockwave.qh" #ifndef IMPLEMENTATION CLASS(Shockwave, Weapon) /* ammotype */ //ATTRIB(Shockwave, ammo_field, .int, ammo_none); diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc index fa166aee6..9ae0c6069 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@ -1,3 +1,4 @@ +#include "shotgun.qh" #ifndef IMPLEMENTATION CLASS(Shotgun, Weapon) /* ammotype */ ATTRIB(Shotgun, ammo_field, .int, ammo_shells); diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc index 2570c7ba7..546e59f24 100644 --- a/qcsrc/common/weapons/weapon/tuba.qc +++ b/qcsrc/common/weapons/weapon/tuba.qc @@ -1,3 +1,4 @@ +#include "tuba.qh" #ifndef IMPLEMENTATION CLASS(Tuba, Weapon) /* impulse */ ATTRIB(Tuba, impulse, int, 1); diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index 8289ccbbd..91cf8e9da 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -1,3 +1,4 @@ +#include "vaporizer.qh" #ifndef IMPLEMENTATION CLASS(Vaporizer, Weapon) /* ammotype */ ATTRIB(Vaporizer, ammo_field, .int, ammo_cells); diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index cd493b493..3e2c1a094 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -1,3 +1,4 @@ +#include "vortex.qh" #ifndef IMPLEMENTATION CLASS(Vortex, Weapon) /* ammotype */ ATTRIB(Vortex, ammo_field, .int, ammo_cells); diff --git a/qcsrc/tools/headerstyle.sh b/qcsrc/tools/headerstyle.sh index 7f86db1ee..924083166 100755 --- a/qcsrc/tools/headerstyle.sh +++ b/qcsrc/tools/headerstyle.sh @@ -17,7 +17,7 @@ function check() { find "$base" -type f -name '*.qc' -print0 | sort -z | while read -r -d '' file; do echo "$file" declare -l file_h="${file%.qc}.qh" - if [ ! -f "$file_h" ]; then echo "#pragma once" > "$file_h"; fi + if [[ ! -f "$file_h" ]]; then echo "#pragma once" > "$file_h"; fi include=$(basename "$file") include="${include%.qc}.qh" @@ -28,21 +28,9 @@ function check() { echo "$file" startswith "$file" "#pragma once" done - find "$base" -type f -name '_mod.inc' -print0 | sort -z | while read -r -d '' file; do - echo "$file" - declare -l file_inc="${file%_mod.inc}_all.inc" - if [ ! -f "$file_inc" ]; then - echo '#include "_all.qh"' > "$file_inc" - echo '#include "_mod.inc"' >> "$file_inc" - fi - declare -l file_qh="${file%_mod.inc}_all.qh" - if [ ! -f "$file_qh" ]; then - echo '#pragma once' > "$file_qh" - echo '#include "_mod.qh"' >> "$file_qh" - fi - done } check client check server check menu +check common -- 2.39.2