From: TimePath Date: Sat, 5 Aug 2017 10:58:46 +0000 (+1000) Subject: client: remove _all X-Git-Tag: xonotic-v0.8.5~2539 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=525dfab061a4b9304d675d3493e87bdd8c272d3d;p=xonotic%2Fxonotic-data.pk3dir.git client: remove _all --- diff --git a/qcsrc/client/_all.inc b/qcsrc/client/_all.inc deleted file mode 100644 index f592f8adb..000000000 --- a/qcsrc/client/_all.inc +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include "_mod.inc" - -#include "commands/_mod.inc" -#include "hud/_mod.inc" -#include "mutators/_mod.inc" -#include "weapons/_mod.inc" - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include diff --git a/qcsrc/client/_all.qh b/qcsrc/client/_all.qh deleted file mode 100644 index 5935342ae..000000000 --- a/qcsrc/client/_all.qh +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once -//#include "_mod.qh" - -#include - -#include -#include -#include - -#include "autocvars.qh" -#include "defs.qh" -#include "main.qh" -#include "miscfunctions.qh" -#include "view.qh" - -#include -#include diff --git a/qcsrc/client/_mod.inc b/qcsrc/client/_mod.inc index 0920265d6..240e07a4a 100644 --- a/qcsrc/client/_mod.inc +++ b/qcsrc/client/_mod.inc @@ -10,3 +10,8 @@ #include #include #include + +#include +#include +#include +#include diff --git a/qcsrc/client/_mod.qh b/qcsrc/client/_mod.qh index 75266dfa2..10482caaa 100644 --- a/qcsrc/client/_mod.qh +++ b/qcsrc/client/_mod.qh @@ -10,3 +10,8 @@ #include #include #include + +#include +#include +#include +#include diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc index a984a19a3..4dc6204cb 100644 --- a/qcsrc/client/bgmscript.qc +++ b/qcsrc/client/bgmscript.qc @@ -1,5 +1,10 @@ #include "bgmscript.qh" +#include +#include +#include +#include + #define CONSTANT_SPEED_DECAY float bgmscriptbuf; diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index e27557cf4..9893b8ae3 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -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 #include #include +#include +#include #include #include #include diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index f6469a58b..9bcdd3d66 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -1,5 +1,7 @@ #include "hud.qh" +#include +#include #include "panel/scoreboard.qh" #include "hud_config.qh" #include "../mapvoting.qh" @@ -7,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc index 073b2d0f7..a1f1cc7ec 100644 --- a/qcsrc/client/hud/hud_config.qc +++ b/qcsrc/client/hud/hud_config.qc @@ -2,6 +2,9 @@ #include "hud.qh" #include "panel/scoreboard.qh" +#include +#include +#include #define HUD_Write(s) fputs(fh, s) #define HUD_Write_Cvar(cvar) HUD_Write(strcat("seta ", cvar, " \"", cvar_string(cvar), "\"\n")) diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc index 7bae78cb6..9e8320452 100644 --- a/qcsrc/client/hud/panel/ammo.qc +++ b/qcsrc/client/hud/panel/ammo.qc @@ -1,6 +1,11 @@ #include "ammo.qh" +#include +#include +#include +#include #include +#include // Ammo (#1) diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc index 3c13fd9c2..a92bdc692 100644 --- a/qcsrc/client/hud/panel/centerprint.qc +++ b/qcsrc/client/hud/panel/centerprint.qc @@ -2,6 +2,8 @@ #include "scoreboard.qh" #include +#include +#include // CenterPrint (#16) diff --git a/qcsrc/client/hud/panel/chat.qc b/qcsrc/client/hud/panel/chat.qc index 554f44e17..74d4b6d0f 100644 --- a/qcsrc/client/hud/panel/chat.qc +++ b/qcsrc/client/hud/panel/chat.qc @@ -1,5 +1,9 @@ #include "chat.qh" +#include +#include +#include + // Chat (#12) void HUD_Chat() diff --git a/qcsrc/client/hud/panel/engineinfo.qc b/qcsrc/client/hud/panel/engineinfo.qc index c8b7203ee..ed7966c16 100644 --- a/qcsrc/client/hud/panel/engineinfo.qc +++ b/qcsrc/client/hud/panel/engineinfo.qc @@ -1,5 +1,8 @@ #include "engineinfo.qh" +#include +#include + // Engine info (#13) float prevfps; diff --git a/qcsrc/client/hud/panel/healtharmor.qc b/qcsrc/client/hud/panel/healtharmor.qc index 5e2bfd3a5..4c08ef900 100644 --- a/qcsrc/client/hud/panel/healtharmor.qc +++ b/qcsrc/client/hud/panel/healtharmor.qc @@ -1,5 +1,8 @@ #include "healtharmor.qh" +#include +#include + #include // Health/armor (#3) diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc index 49739a42d..1e5a0c9f2 100644 --- a/qcsrc/client/hud/panel/infomessages.qc +++ b/qcsrc/client/hud/panel/infomessages.qc @@ -1,5 +1,8 @@ #include "infomessages.qh" +#include +#include + #include #include diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc index 03ab7a425..65682b3ec 100644 --- a/qcsrc/client/hud/panel/modicons.qc +++ b/qcsrc/client/hud/panel/modicons.qc @@ -1,5 +1,7 @@ #include "modicons.qh" +#include +#include #include #include #include diff --git a/qcsrc/client/hud/panel/notify.qc b/qcsrc/client/hud/panel/notify.qc index 910113f4e..82690bee7 100644 --- a/qcsrc/client/hud/panel/notify.qc +++ b/qcsrc/client/hud/panel/notify.qc @@ -1,5 +1,7 @@ #include "notify.qh" +#include +#include // Notifications (#4) diff --git a/qcsrc/client/hud/panel/physics.qc b/qcsrc/client/hud/panel/physics.qc index f34bff3b8..e1fffb59f 100644 --- a/qcsrc/client/hud/panel/physics.qc +++ b/qcsrc/client/hud/panel/physics.qc @@ -1,5 +1,8 @@ #include "physics.qh" +#include +#include +#include #include #include #include diff --git a/qcsrc/client/hud/panel/powerups.qc b/qcsrc/client/hud/panel/powerups.qc index 608e48ce3..dd574cf9b 100644 --- a/qcsrc/client/hud/panel/powerups.qc +++ b/qcsrc/client/hud/panel/powerups.qc @@ -1,5 +1,8 @@ #include "powerups.qh" +#include +#include +#include #include // Powerups (#2) diff --git a/qcsrc/client/hud/panel/pressedkeys.qc b/qcsrc/client/hud/panel/pressedkeys.qc index c659648d2..b4da1dd7d 100644 --- a/qcsrc/client/hud/panel/pressedkeys.qc +++ b/qcsrc/client/hud/panel/pressedkeys.qc @@ -1,5 +1,8 @@ #include "pressedkeys.qh" +#include +#include +#include // Pressed keys (#11) diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index b1920d2b4..3233d1b9b 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -1,5 +1,8 @@ #include "quickmenu.qh" +#include +#include +#include #include #include #include diff --git a/qcsrc/client/hud/panel/racetimer.qc b/qcsrc/client/hud/panel/racetimer.qc index b107a40c0..6a190f2ca 100644 --- a/qcsrc/client/hud/panel/racetimer.qc +++ b/qcsrc/client/hud/panel/racetimer.qc @@ -1,5 +1,8 @@ #include "racetimer.qh" +#include +#include +#include #include // Race timer (#6) diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc index 10b6708e1..b1cc222cc 100644 --- a/qcsrc/client/hud/panel/radar.qc +++ b/qcsrc/client/hud/panel/radar.qc @@ -1,5 +1,8 @@ #include "radar.qh" +#include +#include +#include #include #include #include diff --git a/qcsrc/client/hud/panel/score.qc b/qcsrc/client/hud/panel/score.qc index 2f0f9909c..56fa5867c 100644 --- a/qcsrc/client/hud/panel/score.qc +++ b/qcsrc/client/hud/panel/score.qc @@ -1,5 +1,8 @@ #include "score.qh" +#include +#include +#include #include "scoreboard.qh" #include #include diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 3872197c7..34ecd834f 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -1,5 +1,8 @@ #include "scoreboard.qh" +#include +#include +#include #include "quickmenu.qh" #include #include diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc index 45f46b408..0dcbb70db 100644 --- a/qcsrc/client/hud/panel/timer.qc +++ b/qcsrc/client/hud/panel/timer.qc @@ -1,5 +1,9 @@ #include "timer.qh" +#include +#include +#include + // Timer (#5) void HUD_Timer() diff --git a/qcsrc/client/hud/panel/vote.qc b/qcsrc/client/hud/panel/vote.qc index 22f1678b6..750e62ef8 100644 --- a/qcsrc/client/hud/panel/vote.qc +++ b/qcsrc/client/hud/panel/vote.qc @@ -1,5 +1,8 @@ #include "vote.qh" +#include +#include +#include #include // Vote (#9) diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc index b4997467e..a7c0ade00 100644 --- a/qcsrc/client/hud/panel/weapons.qc +++ b/qcsrc/client/hud/panel/weapons.qc @@ -1,5 +1,10 @@ #include "weapons.qh" +#include +#include +#include +#include +#include // Weapons (#0) diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 2e55584ed..479dd7e8e 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,6 +1,10 @@ #include "main.qh" +#include "miscfunctions.qh" +#include #include +#include +#include #include "hud/_mod.qh" #include "mapvoting.qh" #include "mutators/events.qh" diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 29728dfde..9e783d306 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -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" diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index f23577d81..84a475a7d 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -1,5 +1,7 @@ #include "miscfunctions.qh" +#include "autocvars.qh" +#include "defs.qh" #include "hud/_mod.qh" #include diff --git a/qcsrc/client/player_skeleton.qh b/qcsrc/client/player_skeleton.qh index 50462bdbb..8c5969b09 100644 --- a/qcsrc/client/player_skeleton.qh +++ b/qcsrc/client/player_skeleton.qh @@ -1,5 +1,7 @@ #pragma once +#include + void free_skeleton_from_frames(entity e); void skeleton_from_frames(entity e, float is_dead); void skeleton_loadinfo(entity e); diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc index 738831a5d..f6a7999d4 100644 --- a/qcsrc/client/progs.inc +++ b/qcsrc/client/progs.inc @@ -1,7 +1,21 @@ #include #if XONOTIC -#include + +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include #include #endif diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index ceaf0a674..8a7d225bf 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -1,5 +1,7 @@ #include "shownames.qh" +#include "autocvars.qh" +#include "miscfunctions.qh" #include "hud/_mod.qh" #include diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 782776eb7..7f1654de0 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -1,5 +1,6 @@ #include "teamradar.qh" +#include "autocvars.qh" #include "hud/_mod.qh" #include diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index ece38598e..e4f38b24c 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -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 #include #include +#include #include diff --git a/qcsrc/client/view.qh b/qcsrc/client/view.qh index 01d454637..ac916a089 100644 --- a/qcsrc/client/view.qh +++ b/qcsrc/client/view.qh @@ -1,5 +1,7 @@ #pragma once +#include + vector crosshair_getcolor(entity this, float health_stat); entity viewmodels[MAX_WEAPONSLOTS]; diff --git a/qcsrc/client/wall.qc b/qcsrc/client/wall.qc index 7a31265db..a0d66d719 100644 --- a/qcsrc/client/wall.qc +++ b/qcsrc/client/wall.qc @@ -1,5 +1,7 @@ #include "wall.qh" +#include "autocvars.qh" +#include "main.qh" #include "bgmscript.qh" diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index 7f64e9ab9..3d2d32d9a 100644 --- a/qcsrc/client/weapons/projectile.qc +++ b/qcsrc/client/weapons/projectile.qc @@ -6,6 +6,8 @@ #include "../mutators/events.qh" #include +#include +#include #include #include diff --git a/qcsrc/client/weapons/projectile.qh b/qcsrc/client/weapons/projectile.qh index cc9575360..a6ae46347 100644 --- a/qcsrc/client/weapons/projectile.qh +++ b/qcsrc/client/weapons/projectile.qh @@ -1,5 +1,7 @@ #pragma once +#include + entityclass(Projectile); class(Projectile).int traileffect; diff --git a/qcsrc/common/effects/all.inc b/qcsrc/common/effects/all.inc index 7d2f1d592..6439a49bb 100644 --- a/qcsrc/common/effects/all.inc +++ b/qcsrc/common/effects/all.inc @@ -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! diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh index 65cdd83d3..14a758b26 100644 --- a/qcsrc/common/ent_cs.qh +++ b/qcsrc/common/ent_cs.qh @@ -1,5 +1,9 @@ #pragma once +#ifdef CSQC +#include +#endif + REGISTER_NET_LINKED(ENT_CLIENT_ENTCS) REGISTER_NET_TEMP(CLIENT_ENTCS) diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh index 52fa9b85c..7072261b7 100644 --- a/qcsrc/common/items/item.qh +++ b/qcsrc/common/items/item.qh @@ -1,6 +1,11 @@ #pragma once #include +#ifdef GAMEQC +#include +#include +#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. diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh index dccd36886..fae573c70 100644 --- a/qcsrc/common/items/item/pickup.qh +++ b/qcsrc/common/items/item/pickup.qh @@ -21,6 +21,12 @@ PROPERTY(float, g_pickup_respawntimejitter_powerup) #include #include +#ifdef GAMEQC +#include +#include +#include +#endif + CLASS(Pickup, GameItem) #ifdef GAMEQC ATTRIB(Pickup, m_model, Model); diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc index 5b0ee3c5b..2049dc9ea 100644 --- a/qcsrc/common/minigames/cl_minigames_hud.qc +++ b/qcsrc/common/minigames/cl_minigames_hud.qc @@ -1,5 +1,6 @@ #include "cl_minigames_hud.qh" +#include #include #include "minigames.qh" diff --git a/qcsrc/common/minigames/minigame/nmm.qc b/qcsrc/common/minigames/minigame/nmm.qc index bf26a66cc..82e09c324 100644 --- a/qcsrc/common/minigames/minigame/nmm.qc +++ b/qcsrc/common/minigames/minigame/nmm.qc @@ -1,4 +1,9 @@ #include "nmm.qh" + +#ifdef CSQC +#include +#endif + 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/mutators/base.qh b/qcsrc/common/mutators/base.qh index 4e7676c15..2b932b275 100644 --- a/qcsrc/common/mutators/base.qh +++ b/qcsrc/common/mutators/base.qh @@ -1,5 +1,9 @@ #pragma once +#ifdef CSQC +#include +#endif + const int CBC_ORDER_FIRST = 1; const int CBC_ORDER_LAST = 2; const int CBC_ORDER_EXCLUSIVE = 3; diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index aea0ccd62..4cc59a5d0 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -6,6 +6,10 @@ #include #include +#ifdef CSQC +#include +#endif + /** main types/groups of notifications */ ENUMCLASS(MSG) /** "Global" AND "personal" announcer messages */ diff --git a/qcsrc/common/sounds/all.inc b/qcsrc/common/sounds/all.inc index 7462239f7..31b5ed487 100644 --- a/qcsrc/common/sounds/all.inc +++ b/qcsrc/common/sounds/all.inc @@ -1,3 +1,5 @@ +#pragma once + // Global list of sounds // TODO: remove uses of _sound diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 83fe0c196..c88e3a704 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -4,8 +4,8 @@ #include #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" diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh index 163326343..ab24ec4a8 100644 --- a/qcsrc/common/weapons/weapon.qh +++ b/qcsrc/common/weapons/weapon.qh @@ -7,6 +7,8 @@ #include #endif +USING(WepSet, vector); + const int MAX_WEAPONSLOTS = 2; .entity weaponentities[MAX_WEAPONSLOTS]; diff --git a/qcsrc/tools/compilationunits.sh b/qcsrc/tools/compilationunits.sh index 55799ff7c..e835fa671 100755 --- a/qcsrc/tools/compilationunits.sh +++ b/qcsrc/tools/compilationunits.sh @@ -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 }