client: remove _all
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 5 Aug 2017 10:58:46 +0000 (20:58 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 5 Aug 2017 10:58:46 +0000 (20:58 +1000)
51 files changed:
qcsrc/client/_all.inc [deleted file]
qcsrc/client/_all.qh [deleted file]
qcsrc/client/_mod.inc
qcsrc/client/_mod.qh
qcsrc/client/bgmscript.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud_config.qc
qcsrc/client/hud/panel/ammo.qc
qcsrc/client/hud/panel/centerprint.qc
qcsrc/client/hud/panel/chat.qc
qcsrc/client/hud/panel/engineinfo.qc
qcsrc/client/hud/panel/healtharmor.qc
qcsrc/client/hud/panel/infomessages.qc
qcsrc/client/hud/panel/modicons.qc
qcsrc/client/hud/panel/notify.qc
qcsrc/client/hud/panel/physics.qc
qcsrc/client/hud/panel/powerups.qc
qcsrc/client/hud/panel/pressedkeys.qc
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/hud/panel/racetimer.qc
qcsrc/client/hud/panel/radar.qc
qcsrc/client/hud/panel/score.qc
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/timer.qc
qcsrc/client/hud/panel/vote.qc
qcsrc/client/hud/panel/weapons.qc
qcsrc/client/main.qc
qcsrc/client/mapvoting.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/player_skeleton.qh
qcsrc/client/progs.inc
qcsrc/client/shownames.qc
qcsrc/client/teamradar.qc
qcsrc/client/view.qc
qcsrc/client/view.qh
qcsrc/client/wall.qc
qcsrc/client/weapons/projectile.qc
qcsrc/client/weapons/projectile.qh
qcsrc/common/effects/all.inc
qcsrc/common/ent_cs.qh
qcsrc/common/items/item.qh
qcsrc/common/items/item/pickup.qh
qcsrc/common/minigames/cl_minigames_hud.qc
qcsrc/common/minigames/minigame/nmm.qc
qcsrc/common/mutators/base.qh
qcsrc/common/notifications/all.qh
qcsrc/common/sounds/all.inc
qcsrc/common/weapons/all.qh
qcsrc/common/weapons/weapon.qh
qcsrc/tools/compilationunits.sh

diff --git a/qcsrc/client/_all.inc b/qcsrc/client/_all.inc
deleted file mode 100644 (file)
index f592f8a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <client/_all.qh>
-#include "_mod.inc"
-
-#include "commands/_mod.inc"
-#include "hud/_mod.inc"
-#include "mutators/_mod.inc"
-#include "weapons/_mod.inc"
-
-#include <common/_all.inc>
-#include <common/effects/qc/all.qc>
-
-#include <lib/csqcmodel/cl_model.qc>
-#include <lib/csqcmodel/cl_player.qc>
-#include <lib/csqcmodel/interpolate.qc>
-
-#include <lib/warpzone/anglestransform.qc>
-#include <lib/warpzone/common.qc>
-#include <lib/warpzone/client.qc>
-#include <lib/warpzone/server.qc>
-#include <lib/warpzone/util_server.qc>
diff --git a/qcsrc/client/_all.qh b/qcsrc/client/_all.qh
deleted file mode 100644 (file)
index 5935342..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-//#include "_mod.qh"
-
-#include <common/util.qh>
-
-#include <common/effects/all.qh>
-#include <common/models/all.qh>
-#include <common/sounds/all.qh>
-
-#include "autocvars.qh"
-#include "defs.qh"
-#include "main.qh"
-#include "miscfunctions.qh"
-#include "view.qh"
-
-#include <common/ent_cs.qh>
-#include <common/wepent.qh>
index 0920265..240e07a 100644 (file)
@@ -10,3 +10,8 @@
 #include <client/teamradar.qc>
 #include <client/view.qc>
 #include <client/wall.qc>
+
+#include <client/commands/_mod.inc>
+#include <client/hud/_mod.inc>
+#include <client/mutators/_mod.inc>
+#include <client/weapons/_mod.inc>
index 75266df..10482ca 100644 (file)
@@ -10,3 +10,8 @@
 #include <client/teamradar.qh>
 #include <client/view.qh>
 #include <client/wall.qh>
+
+#include <client/commands/_mod.qh>
+#include <client/hud/_mod.qh>
+#include <client/mutators/_mod.qh>
+#include <client/weapons/_mod.qh>
index a984a19..4dc6204 100644 (file)
@@ -1,5 +1,10 @@
 #include "bgmscript.qh"
 
+#include <common/util.qh>
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/main.qh>
+
 #define CONSTANT_SPEED_DECAY
 
 float bgmscriptbuf;
index e27557c..9893b8a 100644 (file)
@@ -1,4 +1,7 @@
 #include "csqcmodel_hooks.qh"
+#include "autocvars.qh"
+#include "csqcmodel_hooks.qh"
+#include "miscfunctions.qh"
 #include "mutators/events.qh"
 #include "player_skeleton.qh"
 #include "weapons/projectile.qh"
@@ -6,6 +9,8 @@
 #include <common/ent_cs.qh>
 #include <common/physics/movetypes/movetypes.qh>
 #include <common/viewloc.qh>
+#include <common/effects/all.qh>
+#include <common/effects/all.inc>
 #include <lib/csqcmodel/cl_model.qh>
 #include <lib/csqcmodel/cl_player.qh>
 #include <lib/csqcmodel/interpolate.qh>
index f6469a5..9bcdd3d 100644 (file)
@@ -1,5 +1,7 @@
 #include "hud.qh"
 
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include "panel/scoreboard.qh"
 #include "hud_config.qh"
 #include "../mapvoting.qh"
@@ -7,6 +9,7 @@
 #include <common/minigames/cl_minigames.qh>
 #include <common/t_items.qh>
 #include <common/deathtypes/all.qh>
+#include <common/ent_cs.qh>
 #include <common/items/_mod.qh>
 #include <common/mapinfo.qh>
 #include <common/vehicles/all.qh>
index 073b2d0..a1f1cc7 100644 (file)
@@ -2,6 +2,9 @@
 
 #include "hud.qh"
 #include "panel/scoreboard.qh"
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 
 #define HUD_Write(s) fputs(fh, s)
 #define HUD_Write_Cvar(cvar) HUD_Write(strcat("seta ", cvar, " \"", cvar_string(cvar), "\"\n"))
index 7bae78c..9e83204 100644 (file)
@@ -1,6 +1,11 @@
 #include "ammo.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+#include <client/view.qh>
 #include <common/t_items.qh>
+#include <common/wepent.qh>
 
 // Ammo (#1)
 
index 3c13fd9..a92bdc6 100644 (file)
@@ -2,6 +2,8 @@
 
 #include "scoreboard.qh"
 #include <common/notifications/all.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 
 // CenterPrint (#16)
 
index 554f44e..74d4b6d 100644 (file)
@@ -1,5 +1,9 @@
 #include "chat.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+
 // Chat (#12)
 
 void HUD_Chat()
index c8b7203..ed7966c 100644 (file)
@@ -1,5 +1,8 @@
 #include "engineinfo.qh"
 
+#include <client/autocvars.qh>
+#include <client/miscfunctions.qh>
+
 // Engine info (#13)
 
 float prevfps;
index 5e2bfd3..4c08ef9 100644 (file)
@@ -1,5 +1,8 @@
 #include "healtharmor.qh"
 
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+
 #include <common/deathtypes/all.qh>
 
 // Health/armor (#3)
index 49739a4..1e5a0c9 100644 (file)
@@ -1,5 +1,8 @@
 #include "infomessages.qh"
 
+#include <client/autocvars.qh>
+#include <client/miscfunctions.qh>
+
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 
index 03ab7a4..65682b3 100644 (file)
@@ -1,5 +1,7 @@
 #include "modicons.qh"
 
+#include <client/miscfunctions.qh>
+#include <client/autocvars.qh>
 #include <common/mapinfo.qh>
 #include <common/ent_cs.qh>
 #include <common/scores.qh>
index 910113f..82690be 100644 (file)
@@ -1,5 +1,7 @@
 #include "notify.qh"
 
+#include <client/autocvars.qh>
+#include <client/miscfunctions.qh>
 
 // Notifications (#4)
 
index f34bff3..e1fffb5 100644 (file)
@@ -1,5 +1,8 @@
 #include "physics.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include <client/main.qh>
 #include <common/mapinfo.qh>
 #include <lib/csqcmodel/cl_player.qh>
index 608e48c..dd574cf 100644 (file)
@@ -1,5 +1,8 @@
 #include "powerups.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include <common/items/_mod.qh>
 
 // Powerups (#2)
index c659648..b4da1dd 100644 (file)
@@ -1,5 +1,8 @@
 #include "pressedkeys.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 
 // Pressed keys (#11)
 
index b1920d2..3233d1b 100644 (file)
@@ -1,5 +1,8 @@
 #include "quickmenu.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include <common/ent_cs.qh>
 #include <client/hud/_mod.qh>
 #include <client/mapvoting.qh>
index b107a40..6a190f2 100644 (file)
@@ -1,5 +1,8 @@
 #include "racetimer.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include <common/mapinfo.qh>
 
 // Race timer (#6)
index 10b6708..b1cc222 100644 (file)
@@ -1,5 +1,8 @@
 #include "radar.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
 #include <client/mapvoting.qh>
index 2f0f990..56fa586 100644 (file)
@@ -1,5 +1,8 @@
 #include "score.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include "scoreboard.qh"
 #include <common/ent_cs.qh>
 #include <common/mapinfo.qh>
index 3872197..34ecd83 100644 (file)
@@ -1,5 +1,8 @@
 #include "scoreboard.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include "quickmenu.qh"
 #include <common/ent_cs.qh>
 #include <common/constants.qh>
index 45f46b4..0dcbb70 100644 (file)
@@ -1,5 +1,9 @@
 #include "timer.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+
 // Timer (#5)
 
 void HUD_Timer()
index 22f1678..750e62e 100644 (file)
@@ -1,5 +1,8 @@
 #include "vote.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
 #include <common/mapinfo.qh>
 
 // Vote (#9)
index b499746..a7c0ade 100644 (file)
@@ -1,5 +1,10 @@
 #include "weapons.qh"
 
+#include <client/autocvars.qh>
+#include <client/defs.qh>
+#include <client/miscfunctions.qh>
+#include <client/view.qh>
+#include <common/wepent.qh>
 
 // Weapons (#0)
 
index 2e55584..479dd7e 100644 (file)
@@ -1,6 +1,10 @@
 #include "main.qh"
 
+#include "miscfunctions.qh"
+#include <common/effects/effect.qh>
 #include <common/effects/qc/all.qh>
+#include <common/effects/all.qh>
+#include <common/effects/all.inc>
 #include "hud/_mod.qh"
 #include "mapvoting.qh"
 #include "mutators/events.qh"
index 29728df..9e783d3 100644 (file)
@@ -1,5 +1,8 @@
 #include "mapvoting.qh"
 
+#include "autocvars.qh"
+#include "miscfunctions.qh"
+#include "defs.qh"
 #include "hud/_mod.qh"
 #include "hud/panel/scoreboard.qh"
 
index f23577d..84a475a 100644 (file)
@@ -1,5 +1,7 @@
 #include "miscfunctions.qh"
 
+#include "autocvars.qh"
+#include "defs.qh"
 #include "hud/_mod.qh"
 
 #include <common/command/_mod.qh>
index 50462bd..8c5969b 100644 (file)
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <common/util.qh>
+
 void free_skeleton_from_frames(entity e);
 void skeleton_from_frames(entity e, float is_dead);
 void skeleton_loadinfo(entity e);
index 738831a..f6a7999 100644 (file)
@@ -1,7 +1,21 @@
 #include <lib/_all.inc>
 
 #if XONOTIC
-#include <client/_all.inc>
+
+#include <client/_mod.inc>
+
+#include <common/_all.inc>
+#include <common/effects/qc/all.qc>
+
+#include <lib/csqcmodel/cl_model.qc>
+#include <lib/csqcmodel/cl_player.qc>
+#include <lib/csqcmodel/interpolate.qc>
+
+#include <lib/warpzone/anglestransform.qc>
+#include <lib/warpzone/common.qc>
+#include <lib/warpzone/client.qc>
+#include <lib/warpzone/server.qc>
+#include <lib/warpzone/util_server.qc>
 
 #include <ecs/_mod.inc>
 #endif
index ceaf0a6..8a7d225 100644 (file)
@@ -1,5 +1,7 @@
 #include "shownames.qh"
 
+#include "autocvars.qh"
+#include "miscfunctions.qh"
 #include "hud/_mod.qh"
 
 #include <common/ent_cs.qh>
index 782776e..7f1654d 100644 (file)
@@ -1,5 +1,6 @@
 #include "teamradar.qh"
 
+#include "autocvars.qh"
 #include "hud/_mod.qh"
 
 #include <common/mutators/mutator/waypoints/all.qh>
index ece3859..e4f38b2 100644 (file)
@@ -1,5 +1,7 @@
 #include "view.qh"
 
+#include "autocvars.qh"
+#include "miscfunctions.qh"
 #include "announcer.qh"
 #include "hud/_mod.qh"
 #include "mapvoting.qh"
@@ -21,6 +23,7 @@
 #include <common/stats.qh>
 #include <common/triggers/target/music.qh>
 #include <common/teams.qh>
+#include <common/wepent.qh>
 
 #include <common/weapons/weapon/tuba.qh>
 
index 01d4546..ac916a0 100644 (file)
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <common/weapons/weapon.qh>
+
 vector crosshair_getcolor(entity this, float health_stat);
 
 entity viewmodels[MAX_WEAPONSLOTS];
index 7a31265..a0d66d7 100644 (file)
@@ -1,5 +1,7 @@
 #include "wall.qh"
 
+#include "autocvars.qh"
+#include "main.qh"
 #include "bgmscript.qh"
 
 
index 7f64e9a..3d2d32d 100644 (file)
@@ -6,6 +6,8 @@
 #include "../mutators/events.qh"
 
 #include <common/constants.qh>
+#include <common/effects/effect.qh>
+#include <common/effects/all.qh>
 #include <common/net_linked.qh>
 #include <common/physics/movetypes/movetypes.qh>
 
index cc95753..a6ae463 100644 (file)
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <common/sounds/sound.qh>
+
 entityclass(Projectile);
 class(Projectile).int traileffect;
 
index 7d2f1d5..6439a49 100644 (file)
@@ -1,3 +1,4 @@
+#pragma once
 // Global list of effects, networked to CSQC by ID to save bandwidth and to use client particle numbers (allows mismatching effectinfos to some degree)
 // Not too concerned about the order of this list, just keep the weapon effects together!
 
index 65cdd83..14a758b 100644 (file)
@@ -1,5 +1,9 @@
 #pragma once
 
+#ifdef CSQC
+#include <client/defs.qh>
+#endif
+
 REGISTER_NET_LINKED(ENT_CLIENT_ENTCS)
 REGISTER_NET_TEMP(CLIENT_ENTCS)
 
index 52fa9b8..7072261 100644 (file)
@@ -1,6 +1,11 @@
 #pragma once
 #include <common/t_items.qh>
 
+#ifdef GAMEQC
+#include <common/sounds/all.qh>
+#include <common/sounds/all.inc>
+#endif
+
 const int IT_UNLIMITED_WEAPON_AMMO             =  BIT(0); // when this bit is set, using a weapon does not reduce ammo. Checkpoints can give this powerup.
 const int IT_UNLIMITED_SUPERWEAPONS            =  BIT(1); // when this bit is set, superweapons don't expire. Checkpoints can give this powerup.
 
index dccd368..fae573c 100644 (file)
@@ -21,6 +21,12 @@ PROPERTY(float, g_pickup_respawntimejitter_powerup)
 #include <common/items/item.qh>
 #include <common/t_items.qh>
 
+#ifdef GAMEQC
+#include <common/models/all.qh>
+#include <common/sounds/all.qh>
+#include <common/sounds/all.inc>
+#endif
+
 CLASS(Pickup, GameItem)
 #ifdef GAMEQC
     ATTRIB(Pickup, m_model, Model);
index 5b0ee3c..2049dc9 100644 (file)
@@ -1,5 +1,6 @@
 #include "cl_minigames_hud.qh"
 
+#include <client/autocvars.qh>
 #include <common/ent_cs.qh>
 
 #include "minigames.qh"
index bf26a66..82e09c3 100644 (file)
@@ -1,4 +1,9 @@
 #include "nmm.qh"
+
+#ifdef CSQC
+#include <client/miscfunctions.qh>
+#endif
+
 REGISTER_MINIGAME(nmm, "Nine Men's Morris");
 
 const int NMM_TURN_PLACE = 0x0100; // player has to place a piece on the board
index 4e7676c..2b932b2 100644 (file)
@@ -1,5 +1,9 @@
 #pragma once
 
+#ifdef CSQC
+#include <client/main.qh>
+#endif
+
 const int CBC_ORDER_FIRST = 1;
 const int CBC_ORDER_LAST = 2;
 const int CBC_ORDER_EXCLUSIVE = 3;
index aea0ccd..4cc59a5 100644 (file)
@@ -6,6 +6,10 @@
 #include <common/teams.qh>
 #include <common/util.qh>
 
+#ifdef CSQC
+#include <client/autocvars.qh>
+#endif
+
 /** main types/groups of notifications */
 ENUMCLASS(MSG)
        /** "Global" AND "personal" announcer messages */
index 7462239..31b5ed4 100644 (file)
@@ -1,3 +1,5 @@
+#pragma once
+
 // Global list of sounds
 // TODO: remove uses of _sound
 
index 83fe0c1..c88e3a7 100644 (file)
@@ -4,8 +4,8 @@
 #include <common/stats.qh>
 #include "config.qh"
 
-// weapon sets
-USING(WepSet, vector);
+#include "weapon.qh"
+
 #ifdef SVQC
 void WriteWepSet(float dest, WepSet w);
 #endif
@@ -16,8 +16,6 @@ WepSet WepSet_GetFromStat_InMap();
 WepSet ReadWepSet();
 #endif
 
-#include "weapon.qh"
-
 #ifdef GAMEQC
 #include "calculations.qh"
 #include "projectiles.qh"
index 1633263..ab24ec4 100644 (file)
@@ -7,6 +7,8 @@
 #include <common/effects/qc/all.qh>
 #endif
 
+USING(WepSet, vector);
+
 const int MAX_WEAPONSLOTS = 2;
 .entity weaponentities[MAX_WEAPONSLOTS];
 
index 55799ff..e835fa6 100755 (executable)
@@ -59,8 +59,10 @@ function check1() {
     declare -l prog="${1}"
     declare -l file="${2}"
     MODE=${prog}
+    includes="-include lib/_all.inc"
+    [ -f ${prog}/_all.qh ] && includes="${includes} -include ${prog}/_all.qh"
     qpp ${file} test.dat \
-            -include lib/_all.inc -include ${prog}/_all.qh \
+            ${includes} \
             -I. ${QCCIDENT} ${QCCDEFS} > ${WORKDIR}/${prog}.qc
     qcc ${QCCFLAGS} -o ../${WORKDIR}/test.dat ../${WORKDIR}/${prog}.qc >/dev/null
 }