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 0920265d630bec596040cd55735ce790510adc76..240e07a4aed707f674c447d01bd2239a65af117c 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 75266dfa2d0aaec18e189dcc84ee21f9e00abcee..10482caaa4b5081b492f925976c5a3fbbd2cc9fe 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 a984a19a32a283dfc7a12f2aacee211761f9e87e..4dc6204cb06a67362e130301cc191b50f8793269 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 e27557cf451446f3e6c722c664ba7a28d750d487..9893b8ae3cbc215fb08acb5c30586eed19fd934d 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 f6469a58b429dbbb1c7bff6f0b1702f4f6d45273..9bcdd3d6624422a18a245423dc2f44589d6a090c 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 073b2d0f7df3874fce2808f679f762b64b50342a..a1f1cc7ecfd6d7e069b4a2d5d90f41a8b4810a14 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 7bae78cb6c5ab38385ea6a0b1cbdbc338be2a732..9e8320452a5e7dcf8db20213e12091dbd9ee1216 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 3c13fd9c2bdfe2d8724c37194796821e0f6bf675..a92bdc69234a1dac1f90762cd8a74243f986c17d 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 554f44e17ec759fa6da826b543672399405f8ee6..74d4b6d0f49462f522298e276770244dc54e278a 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 c8b7203eee9cfc240c09ac0556c3709aeaea7b32..ed7966c16ea1431fe0bfcbdeab2f2386f96897cb 100644 (file)
@@ -1,5 +1,8 @@
 #include "engineinfo.qh"
 
+#include <client/autocvars.qh>
+#include <client/miscfunctions.qh>
+
 // Engine info (#13)
 
 float prevfps;
index 5e2bfd3a5505374d29473888d3c82e610e44b4b1..4c08ef900f02283ddd9fe24ca545f59334ffa31f 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 49739a42df7599e2b63b4370a7226842e68bfd57..1e5a0c9f2f293403c18408e3ff0cdae1fc72d649 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 03ab7a4250cc4bed7f97b354a24045d4a341bd1a..65682b3ec7d27006a653449ad69e7b725ba69516 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 910113f4e083fd877ab5d31250b82ff2e678ba86..82690bee73a3d494a84a69762f7749f75806ce49 100644 (file)
@@ -1,5 +1,7 @@
 #include "notify.qh"
 
+#include <client/autocvars.qh>
+#include <client/miscfunctions.qh>
 
 // Notifications (#4)
 
index f34bff3b8342e9e25a4b50183664d46d9849eb22..e1fffb59f34e52684ee1ac0ec2191322e61e8c59 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 608e48ce39856cabc5c3d1ee575ad29869b521dd..dd574cf9b039c4b69d6654792a36525e7c54ba57 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 c659648d2eb9568948c1b58096254805a0b85baa..b4da1dd7d69ce1e867524405b8dd53f9ecd6f0ce 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 b1920d2b49eedc869e7259aac64dc1742e652654..3233d1b9ba9ea22acaf0d2cf3f869f08f5704473 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 b107a40c0378b95c62ea046030e6dc03d99209d9..6a190f2ca5f7c9b14c90590ed81f5227acc56bf0 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 10b6708e1e3f9c1e6c266f1839809a8876add2a9..b1cc222ccf1a5dab7f70fa08373a41dd184cbe68 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 2f0f9909ce2f8188bb93c7c091f900f64b9bb5df..56fa5867c240f33484f9495d4818bde4b5197e51 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 3872197c7b9940c6c94bfaa96c420ea63e28c824..34ecd834f7ec682ca1e6c1c00d9f8164928e783a 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 45f46b4087ad35da1c4cff70aabe9799a40463f6..0dcbb70dba3cfe067d51160d74b2c26d8be70196 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 22f1678b6f034d1174028e97b5325c35c66a8809..750e62ef82ca44ba685032e61552639e2c6026a0 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 b4997467ee6a5547980a5c918dd9eaafec585a17..a7c0ade00b473de2f7e49cd3604464f657e1fe59 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 2e55584eda8b0941bbe1ee78c484c879d2c02693..479dd7e8eab8486ed14e23b1b333a58df3a1ac59 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 29728dfde6d07cd781c19ae75d199b038c1c1a85..9e783d306237b8dd49c27872c1b1cdd44098f17f 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 f23577d8110c44644467209f835d1b0246da0e38..84a475a7d8a80512b3f8d214711fe62d4553f0bb 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 50462bdbb298948af6a8b61305eea2cf62b165be..8c5969b09fb4db0ae068b7aa50338215be07b2dd 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 738831a5d020daf1d093806332ea290c6b8bce79..f6a7999d440a455a30dc5d0b70aa9e74f4113139 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 ceaf0a6748741c424e0985bcd83f9dac9219591d..8a7d225bff7bdc319260e5e0648a2aaff9b7aa08 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 782776eb7866757ebc7ff8ad24076b4923e57859..7f1654de0660b3d20890730feb19f0417c3252d6 100644 (file)
@@ -1,5 +1,6 @@
 #include "teamradar.qh"
 
+#include "autocvars.qh"
 #include "hud/_mod.qh"
 
 #include <common/mutators/mutator/waypoints/all.qh>
index ece38598ecc96dd42dc7792f70d974fdac5851c3..e4f38b24c2d145e917765d4ee725f171feff083b 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 01d4546374d40dcea83ae807eee7d1064a785bae..ac916a089568f55aa6f4e97e4ba4dc97f7517046 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 7a31265db9d6a549f5c72ef86c8dff2dde75da78..a0d66d719e4ab04a201f990fbcb5defd7aa42822 100644 (file)
@@ -1,5 +1,7 @@
 #include "wall.qh"
 
+#include "autocvars.qh"
+#include "main.qh"
 #include "bgmscript.qh"
 
 
index 7f64e9ab98787708f96a5aa05e9ea783183d4e3f..3d2d32d9af16bff4eeb0c6ca89d1e7951c71e1c5 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 cc95753602b08ba4be92feda0ed17a6a759f5e10..a6ae463477d51162d7364c55e35a4646d1ce20a5 100644 (file)
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <common/sounds/sound.qh>
+
 entityclass(Projectile);
 class(Projectile).int traileffect;
 
index 7d2f1d592739b4777ba1c1ee2940f6ce72a8bed3..6439a49bb21ce32c6c64bbc8814f37dbb8f5520d 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 65cdd83d3a71f4f5df325a8e90b727d936cb1300..14a758b2615a88f9d8bf825eab629dad3f1877ae 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 52fa9b85c6657c2858050f48410c2facfb466e9b..7072261b781b75b797806df8949fcb83ecb8f550 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 dccd3688644e7b4fac80d5cec18f7ecac1818ff3..fae573c70c5551695c24beccdaf7f4f51563d4aa 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 5b0ee3c5b5d8606ecec15f5b57e57734778bfd59..2049dc9eae601b8b03598fb74c2e49efbcba65bf 100644 (file)
@@ -1,5 +1,6 @@
 #include "cl_minigames_hud.qh"
 
+#include <client/autocvars.qh>
 #include <common/ent_cs.qh>
 
 #include "minigames.qh"
index bf26a66ccc9e5150cc88b79f8172b50205e0b6cc..82e09c324ab3982966ea7a08dc33f81527e50467 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 4e7676c15ac33ab335035ce80df3ef2b766d06c7..2b932b275fd61a068ae2b42d618533632ef68b66 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 aea0ccd628c91af67f21810bd75a0c3e8dc3c882..4cc59a5d000a1cdebaf3f0f654ca48ad2961c406 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 7462239f7701d88886e59387b5dec24d3721996b..31b5ed4873642ceb21b2fb3fae77b66c5770fd23 100644 (file)
@@ -1,3 +1,5 @@
+#pragma once
+
 // Global list of sounds
 // TODO: remove uses of _sound
 
index 83fe0c19673ccc513463f50eb13145c90a8d5f1b..c88e3a70421b239a3468af98adb79d17c1460aeb 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 16332634352f966d7f49f2923c1ff5a09c20901e..ab24ec4a87d894c6c924ebde154b2df753e88516 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 55799ff7c4db70fe3d470284b1c8bc6b4548b69d..e835fa67135e5145c0c8bd97ace8512c05492b4f 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
 }