From: TimePath Date: Mon, 15 Aug 2016 12:03:17 +0000 (+1000) Subject: Cleanup #includes X-Git-Tag: xonotic-v0.8.2~688^2~11 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c533c16caf393c1440a10aa49d3581e280c9f4bd Cleanup #includes --- diff --git a/qcsrc/client/_all.inc b/qcsrc/client/_all.inc new file mode 100644 index 0000000000..0c401acb0b --- /dev/null +++ b/qcsrc/client/_all.inc @@ -0,0 +1,20 @@ +#include +#include "_mod.inc" + +#include "commands/_all.inc" +#include "hud/_all.inc" +#include "mutators/_all.inc" +#include "weapons/_all.inc" + +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include diff --git a/qcsrc/client/_all.qh b/qcsrc/client/_all.qh index 746734dee2..5e5b55e313 100644 --- a/qcsrc/client/_all.qh +++ b/qcsrc/client/_all.qh @@ -1,4 +1,5 @@ #pragma once +//#include "_mod.qh" #include diff --git a/qcsrc/client/commands/_all.inc b/qcsrc/client/commands/_all.inc new file mode 100644 index 0000000000..c90682d48c --- /dev/null +++ b/qcsrc/client/commands/_all.inc @@ -0,0 +1,4 @@ +#include +#include "_mod.inc" + +#include diff --git a/qcsrc/client/commands/_all.qh b/qcsrc/client/commands/_all.qh new file mode 100644 index 0000000000..9b89bcdc10 --- /dev/null +++ b/qcsrc/client/commands/_all.qh @@ -0,0 +1,4 @@ +#pragma once +#include "_mod.qh" + +#include diff --git a/qcsrc/client/commands/_mod.inc b/qcsrc/client/commands/_mod.inc index 235f1297fd..49fd90b32a 100644 --- a/qcsrc/client/commands/_mod.inc +++ b/qcsrc/client/commands/_mod.inc @@ -1,3 +1,2 @@ // generated file; do not modify -#include #include diff --git a/qcsrc/client/commands/_mod.qh b/qcsrc/client/commands/_mod.qh index 03df56398c..9e5aa99743 100644 --- a/qcsrc/client/commands/_mod.qh +++ b/qcsrc/client/commands/_mod.qh @@ -1,3 +1,2 @@ // generated file; do not modify -#include #include diff --git a/qcsrc/client/commands/all.qc b/qcsrc/client/commands/all.qc deleted file mode 100644 index bc15eeb689..0000000000 --- a/qcsrc/client/commands/all.qc +++ /dev/null @@ -1,2 +0,0 @@ -#include "all.qh" -#include diff --git a/qcsrc/client/commands/all.qh b/qcsrc/client/commands/all.qh deleted file mode 100644 index 2df61f004b..0000000000 --- a/qcsrc/client/commands/all.qh +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -#include "cl_cmd.qh" diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 9b8f58f944..4c8e915906 100644 --- a/qcsrc/client/commands/cl_cmd.qc +++ b/qcsrc/client/commands/cl_cmd.qc @@ -4,12 +4,12 @@ // Last updated: December 28th, 2011 // ============================================== -#include +#include #include "cl_cmd.qh" #include "../autocvars.qh" #include "../defs.qh" -#include +#include #include "../main.qh" #include "../mapvoting.qh" #include "../miscfunctions.qh" @@ -18,8 +18,6 @@ #include -#include - void DrawDebugModel(entity this) { if (time - floor(time) > 0.5) diff --git a/qcsrc/client/hud/_all.inc b/qcsrc/client/hud/_all.inc new file mode 100644 index 0000000000..9988f9a22e --- /dev/null +++ b/qcsrc/client/hud/_all.inc @@ -0,0 +1,4 @@ +#include +#include "_mod.inc" + +#include "panel/_all.inc" diff --git a/qcsrc/client/hud/_all.qh b/qcsrc/client/hud/_all.qh new file mode 100644 index 0000000000..4ace83e64c --- /dev/null +++ b/qcsrc/client/hud/_all.qh @@ -0,0 +1,4 @@ +#pragma once +#include "_mod.qh" + +#include "panel/_all.qh" diff --git a/qcsrc/client/hud/_mod.inc b/qcsrc/client/hud/_mod.inc index b90f61b8cc..f400d5d00d 100644 --- a/qcsrc/client/hud/_mod.inc +++ b/qcsrc/client/hud/_mod.inc @@ -1,3 +1,4 @@ // generated file; do not modify #include #include +#include diff --git a/qcsrc/client/hud/_mod.qh b/qcsrc/client/hud/_mod.qh index ee9ac8f76f..0ac7251308 100644 --- a/qcsrc/client/hud/_mod.qh +++ b/qcsrc/client/hud/_mod.qh @@ -1,3 +1,4 @@ // generated file; do not modify #include #include +#include diff --git a/qcsrc/client/hud/all.inc b/qcsrc/client/hud/all.inc deleted file mode 100644 index 8305304fe9..0000000000 --- a/qcsrc/client/hud/all.inc +++ /dev/null @@ -1,22 +0,0 @@ -#include "panel/weapons.qc" -#include "panel/ammo.qc" -#include "panel/powerups.qc" -#include "panel/healtharmor.qc" -#include "panel/notify.qc" -#include "panel/timer.qc" -#include "panel/radar.qc" -#include "panel/score.qc" -#include "panel/racetimer.qc" -#include "panel/vote.qc" -#include "panel/modicons.qc" -#include "panel/pressedkeys.qc" -#include "panel/chat.qc" -#include "panel/engineinfo.qc" -#include "panel/infomessages.qc" -#include "panel/physics.qc" -#include "panel/centerprint.qc" -#include "panel/minigame.qc" -// #include "panel/mapvote.qc" -// #include "panel/itemstime.qc" -#include "panel/quickmenu.qc" -#include "panel/scoreboard.qc" diff --git a/qcsrc/client/hud/all.qh b/qcsrc/client/hud/all.qh deleted file mode 100644 index 2e458e6dd5..0000000000 --- a/qcsrc/client/hud/all.qh +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include "hud.qh" -#include "hud_config.qh" diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc index 3a33eb1dd1..760f5d438a 100644 --- a/qcsrc/client/hud/hud.qc +++ b/qcsrc/client/hud/hud.qc @@ -1,5 +1,7 @@ #include "hud.qh" +#include "panel/scoreboard.qh" + #include "hud_config.qh" #include "../mapvoting.qh" #include "../teamradar.qh" @@ -334,8 +336,6 @@ void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertica DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0); } -#include "all.inc" - /* ================== Main HUD system @@ -357,6 +357,8 @@ void HUD_Vehicle() } } +bool HUD_Minigame_Showpanels(); + bool HUD_Panel_CheckFlags(int showflags) { TC(int, showflags); @@ -413,6 +415,7 @@ bool Hud_Shake_Update() return true; } +entity CSQCModel_server2csqc(int i); void calc_followmodel_ofs(entity view); void Hud_Dynamic_Frame() { diff --git a/qcsrc/client/hud/panel.qc b/qcsrc/client/hud/panel.qc new file mode 100644 index 0000000000..558f320338 --- /dev/null +++ b/qcsrc/client/hud/panel.qc @@ -0,0 +1 @@ +#include "panel.qh" diff --git a/qcsrc/client/hud/panel/_all.inc b/qcsrc/client/hud/panel/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/client/hud/panel/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/client/hud/panel/_all.qh b/qcsrc/client/hud/panel/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/client/hud/panel/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/client/hud/panel/_mod.inc b/qcsrc/client/hud/panel/_mod.inc index d495fdee76..7a95752132 100644 --- a/qcsrc/client/hud/panel/_mod.inc +++ b/qcsrc/client/hud/panel/_mod.inc @@ -15,7 +15,7 @@ #include #include #include +#include #include #include #include -#include diff --git a/qcsrc/client/hud/panel/_mod.qh b/qcsrc/client/hud/panel/_mod.qh index fa9b755309..c24b5c0002 100644 --- a/qcsrc/client/hud/panel/_mod.qh +++ b/qcsrc/client/hud/panel/_mod.qh @@ -15,7 +15,7 @@ #include #include #include +#include #include #include #include -#include diff --git a/qcsrc/client/hud/panel/ammo.qh b/qcsrc/client/hud/panel/ammo.qh index 6db88c68b3..71919d2fb0 100644 --- a/qcsrc/client/hud/panel/ammo.qh +++ b/qcsrc/client/hud/panel/ammo.qh @@ -1,2 +1,4 @@ #pragma once #include "../panel.qh" + +void DrawNadeProgressBar(vector myPos, vector mySize, float progress, vector color); diff --git a/qcsrc/client/hud/panel/centerprint.qh b/qcsrc/client/hud/panel/centerprint.qh index 6db88c68b3..1bec93efa6 100644 --- a/qcsrc/client/hud/panel/centerprint.qh +++ b/qcsrc/client/hud/panel/centerprint.qh @@ -1,2 +1,4 @@ #pragma once #include "../panel.qh" + +void reset_centerprint_messages(); diff --git a/qcsrc/client/hud/panel/powerups.qh b/qcsrc/client/hud/panel/powerups.qh index 6db88c68b3..3235f8da67 100644 --- a/qcsrc/client/hud/panel/powerups.qh +++ b/qcsrc/client/hud/panel/powerups.qh @@ -1,2 +1,4 @@ #pragma once #include "../panel.qh" + +void addPowerupItem(string name, string icon, vector color, float currentTime, float lifeTime); diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index b2d3588844..1ceab88e9a 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -2,7 +2,7 @@ // QuickMenu (#23) #include -#include +#include #include // QUICKMENU_MAXLINES must be <= 10 diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index c5e47237b1..b23a770530 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1,7 +1,7 @@ #include "main.qh" #include -#include "hud/all.qh" +#include "hud/_all.qh" #include "mapvoting.qh" #include "mutators/events.qh" #include "hud/panel/scoreboard.qh" diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 19c128a7da..c397c882c9 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -1,6 +1,6 @@ #include "mapvoting.qh" -#include "hud/all.qh" +#include "hud/_all.qh" #include "hud/panel/scoreboard.qh" #include diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 01b0ee3cb4..9b9833286c 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -1,8 +1,8 @@ #include "miscfunctions.qh" -#include "hud/all.qh" +#include "hud/_all.qh" -#include +#include #include diff --git a/qcsrc/client/mutators/_all.inc b/qcsrc/client/mutators/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/client/mutators/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/client/mutators/_all.qh b/qcsrc/client/mutators/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/client/mutators/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/client/mutators/_mod.inc b/qcsrc/client/mutators/_mod.inc index 98fb4815c1..3dfd4f7897 100644 --- a/qcsrc/client/mutators/_mod.inc +++ b/qcsrc/client/mutators/_mod.inc @@ -1 +1,2 @@ // generated file; do not modify +#include diff --git a/qcsrc/client/mutators/_mod.qh b/qcsrc/client/mutators/_mod.qh index 98fb4815c1..b54ee489cf 100644 --- a/qcsrc/client/mutators/_mod.qh +++ b/qcsrc/client/mutators/_mod.qh @@ -1 +1,2 @@ // generated file; do not modify +#include diff --git a/qcsrc/client/mutators/events.qc b/qcsrc/client/mutators/events.qc new file mode 100644 index 0000000000..c2dbb70215 --- /dev/null +++ b/qcsrc/client/mutators/events.qc @@ -0,0 +1 @@ +#include "events.qh" diff --git a/qcsrc/client/progs.inc b/qcsrc/client/progs.inc index 48579ecbb3..cd08bf188b 100644 --- a/qcsrc/client/progs.inc +++ b/qcsrc/client/progs.inc @@ -1,28 +1,7 @@ #include #if XONOTIC - -#include "_all.qh" - -#include "../client/_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 - +#include "_all.inc" #endif #include diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index 165b033fb3..9797abfb1e 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -1,6 +1,6 @@ #include "shownames.qh" -#include "hud/all.qh" +#include "hud/_all.qh" #include #include diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index ab14cd3bf3..84fba6ca68 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -1,6 +1,6 @@ #include "teamradar.qh" -#include "hud/all.qh" +#include "hud/_all.qh" #include diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 339d05209d..8070d0c440 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1,7 +1,7 @@ #include "view.qh" #include "announcer.qh" -#include "hud/all.qh" +#include "hud/_all.qh" #include "mapvoting.qh" #include "shownames.qh" #include "hud/panel/scoreboard.qh" diff --git a/qcsrc/client/weapons/_all.inc b/qcsrc/client/weapons/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/client/weapons/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/client/weapons/_all.qh b/qcsrc/client/weapons/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/client/weapons/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc index b16c24fb47..ef1e03e19f 100644 --- a/qcsrc/common/_all.inc +++ b/qcsrc/common/_all.inc @@ -39,11 +39,11 @@ float autocvar_net_connecttimeout = 30; #include "t_items.qc" #endif -#include "items/_mod.inc" +#include "items/_all.inc" #include "weapons/all.qc" #include "monsters/all.qc" #include "turrets/all.qc" #include "vehicles/all.qc" -#include "mutators/_mod.inc" - #include "gamemodes/_mod.inc" +#include "mutators/_all.inc" + #include "gamemodes/_all.inc" diff --git a/qcsrc/common/command/_all.inc b/qcsrc/common/command/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/common/command/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/common/command/_all.qh b/qcsrc/common/command/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/common/command/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/command/_mod.inc b/qcsrc/common/command/_mod.inc index d2d24f03d9..e3099980ed 100644 --- a/qcsrc/common/command/_mod.inc +++ b/qcsrc/common/command/_mod.inc @@ -1,5 +1,5 @@ // generated file; do not modify -#include #include #include +#include #include diff --git a/qcsrc/common/command/_mod.qh b/qcsrc/common/command/_mod.qh index 440bdcb134..6ca293773c 100644 --- a/qcsrc/common/command/_mod.qh +++ b/qcsrc/common/command/_mod.qh @@ -1,5 +1,5 @@ // generated file; do not modify -#include #include #include +#include #include diff --git a/qcsrc/common/command/all.qc b/qcsrc/common/command/all.qc deleted file mode 100644 index dc1c0441fa..0000000000 --- a/qcsrc/common/command/all.qc +++ /dev/null @@ -1,3 +0,0 @@ -#include "generic.qc" -#include "markup.qc" -#include "rpn.qc" diff --git a/qcsrc/common/command/all.qh b/qcsrc/common/command/all.qh deleted file mode 100644 index 15285b92ec..0000000000 --- a/qcsrc/common/command/all.qh +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "command.qh" -REGISTRY(GENERIC_COMMANDS, BITS(7)) -#define GENERIC_COMMANDS_from(i) _GENERIC_COMMANDS_from(i, NULL) -REGISTER_REGISTRY(GENERIC_COMMANDS) -REGISTRY_SORT(GENERIC_COMMANDS) - -#define GENERIC_COMMAND(id, description) \ - CLASS(genericcommand_##id, Command) \ - ATTRIB(genericcommand_##id, m_name, string, #id); \ - ATTRIB(genericcommand_##id, m_description, string, description); \ - ENDCLASS(genericcommand_##id) \ - REGISTER(GENERIC_COMMANDS, CMD_G, id, m_id, NEW(genericcommand_##id)); \ - METHOD(genericcommand_##id, m_invokecmd, void(genericcommand_##id this, int request, entity caller, int arguments, string command)) - -STATIC_INIT(GENERIC_COMMANDS_aliases) { - FOREACH(GENERIC_COMMANDS, true, localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_svmenu"))); -} - -#include "generic.qh" -#include "markup.qh" -#include "rpn.qh" diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 8f3449b3e1..5693329182 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -1,4 +1,5 @@ -#include "all.qh" +#include "_all.qh" +#include "reg.qh" #include "markup.qh" #include "rpn.qh" @@ -14,10 +15,7 @@ #endif #ifdef SVQC - #include - #include - #include - #include + #include #include #include #endif diff --git a/qcsrc/common/command/reg.qc b/qcsrc/common/command/reg.qc new file mode 100644 index 0000000000..c0af5b5e09 --- /dev/null +++ b/qcsrc/common/command/reg.qc @@ -0,0 +1 @@ +#include "reg.qh" diff --git a/qcsrc/common/command/reg.qh b/qcsrc/common/command/reg.qh new file mode 100644 index 0000000000..9868e2490a --- /dev/null +++ b/qcsrc/common/command/reg.qh @@ -0,0 +1,19 @@ +#pragma once + +#include "command.qh" +REGISTRY(GENERIC_COMMANDS, BITS(7)) +#define GENERIC_COMMANDS_from(i) _GENERIC_COMMANDS_from(i, NULL) +REGISTER_REGISTRY(GENERIC_COMMANDS) +REGISTRY_SORT(GENERIC_COMMANDS) + +#define GENERIC_COMMAND(id, description) \ + CLASS(genericcommand_##id, Command) \ + ATTRIB(genericcommand_##id, m_name, string, #id); \ + ATTRIB(genericcommand_##id, m_description, string, description); \ + ENDCLASS(genericcommand_##id) \ + REGISTER(GENERIC_COMMANDS, CMD_G, id, m_id, NEW(genericcommand_##id)); \ + METHOD(genericcommand_##id, m_invokecmd, void(genericcommand_##id this, int request, entity caller, int arguments, string command)) + +STATIC_INIT(GENERIC_COMMANDS_aliases) { + FOREACH(GENERIC_COMMANDS, true, localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_svmenu"))); +} diff --git a/qcsrc/common/gamemodes/_all.inc b/qcsrc/common/gamemodes/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/common/gamemodes/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/common/gamemodes/_all.qh b/qcsrc/common/gamemodes/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/common/gamemodes/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/items/_all.inc b/qcsrc/common/items/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/common/items/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/common/items/_all.qh b/qcsrc/common/items/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/common/items/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/items/all.qc b/qcsrc/common/items/all.qc index 7a3e500469..ab77f3071e 100644 --- a/qcsrc/common/items/all.qc +++ b/qcsrc/common/items/all.qc @@ -2,7 +2,7 @@ #define ITEMS_ALL_C #include "all.qh" -#include "item/_mod.inc" +#include "item/_all.inc" void Dump_Items() { diff --git a/qcsrc/common/items/all.qh b/qcsrc/common/items/all.qh index ff54a3a299..73bd502c8f 100644 --- a/qcsrc/common/items/all.qh +++ b/qcsrc/common/items/all.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "item.qh" diff --git a/qcsrc/common/items/item/_all.inc b/qcsrc/common/items/item/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/common/items/item/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/common/items/item/_all.qh b/qcsrc/common/items/item/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/common/items/item/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/monsters/all.qc b/qcsrc/common/monsters/all.qc index fa3f65193a..3abacacca1 100644 --- a/qcsrc/common/monsters/all.qc +++ b/qcsrc/common/monsters/all.qc @@ -15,7 +15,7 @@ string M_Model(string m_mdl) #include "all.qh" #define IMPLEMENTATION -#include "monster/_mod.inc" +#include "monster/_all.inc" #undef IMPLEMENTATION #ifdef SVQC diff --git a/qcsrc/common/monsters/all.qh b/qcsrc/common/monsters/all.qh index 84f7a0d78f..d49489f134 100644 --- a/qcsrc/common/monsters/all.qh +++ b/qcsrc/common/monsters/all.qh @@ -16,4 +16,4 @@ const int MON_FIRST = 1; REGISTER_MONSTER(Null, NEW(Monster)); -#include "monster/_mod.inc" +#include "monster/_all.inc" diff --git a/qcsrc/common/monsters/monster/_all.inc b/qcsrc/common/monsters/monster/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/common/monsters/monster/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/common/monsters/monster/_all.qh b/qcsrc/common/monsters/monster/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/common/monsters/monster/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index ea46be5f12..21d5ad73f9 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -18,8 +18,7 @@ #include "../turrets/util.qh" #include "../vehicles/all.qh" #include - #include - #include + #include #include "../triggers/triggers.qh" #include #include diff --git a/qcsrc/common/mutators/_all.inc b/qcsrc/common/mutators/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/common/mutators/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/common/mutators/_all.qh b/qcsrc/common/mutators/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/common/mutators/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index 983b69f3f4..e66ea3f0a5 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/qcsrc/common/turrets/all.qc b/qcsrc/common/turrets/all.qc index 469a64c927..ec62c248c1 100644 --- a/qcsrc/common/turrets/all.qc +++ b/qcsrc/common/turrets/all.qc @@ -7,7 +7,7 @@ REGISTER_NET_LINKED(ENT_CLIENT_TURRET) #endif #define IMPLEMENTATION -#include "turret/_mod.inc" +#include "turret/_all.inc" #undef IMPLEMENTATION #ifdef CSQC diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh index 476da2d18e..cbb0379f04 100644 --- a/qcsrc/common/turrets/all.qh +++ b/qcsrc/common/turrets/all.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "config.qh" #include "turret.qh" @@ -73,4 +73,4 @@ const int TUR_FIRST = 1; REGISTER_TURRET(Null, NEW(Turret)); -#include "turret/_mod.inc" +#include "turret/_all.inc" diff --git a/qcsrc/common/turrets/turret/_all.inc b/qcsrc/common/turrets/turret/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/common/turrets/turret/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/common/turrets/turret/_all.qh b/qcsrc/common/turrets/turret/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/common/turrets/turret/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/turrets/turret/ewheel.qh b/qcsrc/common/turrets/turret/ewheel.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/ewheel.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/flac.qh b/qcsrc/common/turrets/turret/flac.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/flac.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/fusionreactor.qh b/qcsrc/common/turrets/turret/fusionreactor.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/fusionreactor.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/hellion.qh b/qcsrc/common/turrets/turret/hellion.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/hellion.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/hk.qh b/qcsrc/common/turrets/turret/hk.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/hk.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/machinegun.qh b/qcsrc/common/turrets/turret/machinegun.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/machinegun.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/mlrs.qh b/qcsrc/common/turrets/turret/mlrs.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/mlrs.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/phaser.qh b/qcsrc/common/turrets/turret/phaser.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/phaser.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/plasma.qh b/qcsrc/common/turrets/turret/plasma.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/plasma.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/plasma_dual.qh b/qcsrc/common/turrets/turret/plasma_dual.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/plasma_dual.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/tesla.qh b/qcsrc/common/turrets/turret/tesla.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/tesla.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/turrets/turret/walker.qh b/qcsrc/common/turrets/turret/walker.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/turrets/turret/walker.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/vehicles/all.qc b/qcsrc/common/vehicles/all.qc index 251df22839..5a14b647d1 100644 --- a/qcsrc/common/vehicles/all.qc +++ b/qcsrc/common/vehicles/all.qc @@ -12,7 +12,7 @@ REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR) #endif #define IMPLEMENTATION -#include "vehicle/_mod.inc" +#include "vehicle/_all.inc" #undef IMPLEMENTATION #endif diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh index 158492f661..779076a743 100644 --- a/qcsrc/common/vehicles/all.qh +++ b/qcsrc/common/vehicles/all.qh @@ -20,4 +20,4 @@ const int VEH_FIRST = 1; REGISTER_VEHICLE(Null, NEW(Vehicle)); -#include "vehicle/_mod.inc" +#include "vehicle/_all.inc" diff --git a/qcsrc/common/vehicles/vehicle/_all.inc b/qcsrc/common/vehicles/vehicle/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/common/vehicles/vehicle/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/common/vehicles/vehicle/_all.qh b/qcsrc/common/vehicles/vehicle/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/common/vehicles/vehicle/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/common/vehicles/vehicle/racer.qh b/qcsrc/common/vehicles/vehicle/racer.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/vehicles/vehicle/racer.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qh b/qcsrc/common/vehicles/vehicle/spiderbot.qh new file mode 100644 index 0000000000..6f70f09bee --- /dev/null +++ b/qcsrc/common/vehicles/vehicle/spiderbot.qh @@ -0,0 +1 @@ +#pragma once diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 2b75ec0313..d1bd2d7e64 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -39,7 +39,7 @@ #include "../deathtypes/all.qh" #include #include "../mapinfo.qh" - #include + #include #include #include #include diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index a3f7eb4d0f..113ae8306d 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include "config.qh" diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc index 83a0ebf34a..cdacdc64c0 100644 --- a/qcsrc/lib/_all.inc +++ b/qcsrc/lib/_all.inc @@ -122,7 +122,7 @@ void isnt_bool(float this) { print(ftos(this)); } #include "vector.qh" #include "yenc.qh" -#include "matrix/_mod.inc" +#include "matrix/_all.inc" #ifndef SVQC #define objerror_safe(e) diff --git a/qcsrc/lib/matrix/_all.inc b/qcsrc/lib/matrix/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/lib/matrix/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/lib/matrix/_all.qh b/qcsrc/lib/matrix/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/lib/matrix/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/lib/matrix/command.qc b/qcsrc/lib/matrix/command.qc index 27c7ec959c..449aa373b3 100644 --- a/qcsrc/lib/matrix/command.qc +++ b/qcsrc/lib/matrix/command.qc @@ -1,6 +1,6 @@ #include "command.qh" -#include +#include GENERIC_COMMAND(mx, "Send a matrix command") { switch (argv(1)) { diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc index de692ee819..bff2197022 100644 --- a/qcsrc/lib/warpzone/server.qc +++ b/qcsrc/lib/warpzone/server.qc @@ -7,7 +7,7 @@ #include #include #include - #include + #include #include #include #endif diff --git a/qcsrc/menu/_all.inc b/qcsrc/menu/_all.inc new file mode 100644 index 0000000000..bebbdcc199 --- /dev/null +++ b/qcsrc/menu/_all.inc @@ -0,0 +1,10 @@ +#include +#include "_mod.inc" + +#include "anim/_all.inc" +#include "command/_all.inc" +#include "item/_all.inc" +#include "mutators/_all.inc" +#include "xonotic/_all.inc" + +#include diff --git a/qcsrc/menu/anim/_all.inc b/qcsrc/menu/anim/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/menu/anim/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/menu/anim/_all.qh b/qcsrc/menu/anim/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/menu/anim/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/menu/auto-super.pl b/qcsrc/menu/auto-super.pl deleted file mode 100644 index 00926d0617..0000000000 --- a/qcsrc/menu/auto-super.pl +++ /dev/null @@ -1,101 +0,0 @@ -my %classoffile = (); -my %classes = (); -my %baseclass = (); -my %methods = (); -my %attrs = (); -my %methodnames = (); -my %old2new = (); - -print STDERR "Scanning...\n"; -for my $f(@ARGV) -{ - open my $fh, '<', $f; - while(<$fh>) - { - if(/^CLASS\(([^)]*)\)(?:\s*EXTENDS\(([^)]*)\))?/) - { - $classes{$1} = defined($2) ? $2 : "Object"; - $classoffile{$f} = $1; - } - if(/^\s*METHOD\(([^),]*),\s*([^),]*)/) - { - $methods{$1}{$2} = $1; - $methodnames{"$1"."_"."$2"} = $f; - $old2new{"$2$1"} = "$1"."_"."$2"; - } - if(/^\s*ATTRIB(?:ARRAY)?\(([^),]*),\s*([^),]*)/) - { - $attrs{$1}{$2} = $1; - } - } - close $fh; -} - -# propagate down methods etc. -print STDERR "Propagating...\n"; -for my $class(keys %classes) -{ - print STDERR "$class"; - my $base = $class; - for(;;) - { - $base = $classes{$base}; - last if not defined $base; - print STDERR " -> $base"; - while(my ($method, $definingclass) = each %{$methods{$base}}) - { - $methods{$class}{$method} = $definingclass - if not defined $methods{$class}{$method}; - } - while(my ($attr, $definingclass) = each %{$attrs{$base}}) - { - $attrs{$class}{$attr} = $definingclass - if not defined $attrs{$class}{$attr}; - } - } - print STDERR "\n"; -} - -# change all calls to base method to super, complain about skipping -print STDERR "Fixing...\n"; -for my $f(@ARGV) -{ - open my $fh, '<', $f; - my $s = do { undef local $/; <$fh>; }; - my $s0 = $s; - close $fh; - - my $class = $classoffile{$f}; - my $base = $classes{$class}; - next if not defined $base; - - for(keys %old2new) - { - $s =~ s/\b$_\b/$old2new{$_}/g; - } - - my @methods_super = map { [ $methods{$base}{$_} . "_" . $_, "SUPER($class).$_" ]; } keys %{$methods{$base}}; - for(@methods_super) - { - my ($search, $replace) = @$_; - my $n = ($s =~ s/\b$search\b/$replace/g); - print STDERR "[$f] $search -> $replace... $n replacements\n" - if $n; - } - - for(grep { $methodnames{$_} ne $f } keys %methodnames) - { - if($s =~ /\b$_\b/) - { - print STDERR "[$f] calls non-super external method directly: $_\n"; - } - } - - if($s ne $s0) - { - print STDERR "Rewriting $f...\n"; - open my $fh, '>', $f; - print $fh $s; - close $fh; - } -} diff --git a/qcsrc/menu/command/_all.inc b/qcsrc/menu/command/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/menu/command/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/menu/command/_all.qh b/qcsrc/menu/command/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/menu/command/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/menu/command/all.qc b/qcsrc/menu/command/all.qc index 2f8df96b6b..63b9b78a85 100644 --- a/qcsrc/menu/command/all.qc +++ b/qcsrc/menu/command/all.qc @@ -1,3 +1,3 @@ #include "all.qh" -#include +#include diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index 0f87cbb095..fb0ac17993 100644 --- a/qcsrc/menu/command/menu_cmd.qc +++ b/qcsrc/menu/command/menu_cmd.qc @@ -5,7 +5,7 @@ #include "../mutators/events.qh" -#include +#include .entity firstChild, nextSibling; diff --git a/qcsrc/menu/item/_all.inc b/qcsrc/menu/item/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/menu/item/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/menu/item/_all.qh b/qcsrc/menu/item/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/menu/item/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/menu/mutators/_all.inc b/qcsrc/menu/mutators/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/menu/mutators/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/menu/mutators/_all.qh b/qcsrc/menu/mutators/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/menu/mutators/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/menu/progs.inc b/qcsrc/menu/progs.inc index ad08af93dd..80d1475292 100644 --- a/qcsrc/menu/progs.inc +++ b/qcsrc/menu/progs.inc @@ -1,16 +1,7 @@ #include #if XONOTIC - -#include "../menu/_mod.inc" -#include "anim/_mod.inc" -#include "command/_mod.inc" -#include "item/_mod.inc" -#include "mutators/_mod.inc" -#include "xonotic/_mod.inc" - -#include - +#include "_all.inc" #endif #if BUILD_MOD diff --git a/qcsrc/menu/xonotic/_all.inc b/qcsrc/menu/xonotic/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/menu/xonotic/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/menu/xonotic/_all.qh b/qcsrc/menu/xonotic/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/menu/xonotic/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index 9cc4da8c38..3ad5754488 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -7,7 +7,7 @@ #include #include #include -#include +#include float GL_CheckExtension(string ext) { diff --git a/qcsrc/server/_all.inc b/qcsrc/server/_all.inc new file mode 100644 index 0000000000..d2d15bb92a --- /dev/null +++ b/qcsrc/server/_all.inc @@ -0,0 +1,18 @@ +#include +#include "_mod.inc" + +#include "bot/_all.inc" +#include "command/_all.inc" +#include "mutators/_all.inc" +#include "pathlib/_all.inc" +#include "weapons/_all.inc" + +#include +#include + +#include + +#include +#include +#include +#include diff --git a/qcsrc/server/bot/_all.inc b/qcsrc/server/bot/_all.inc new file mode 100644 index 0000000000..ae3f973b06 --- /dev/null +++ b/qcsrc/server/bot/_all.inc @@ -0,0 +1,4 @@ +#include +#include "_mod.inc" + +#include "default/_all.inc" diff --git a/qcsrc/server/bot/_all.qh b/qcsrc/server/bot/_all.qh new file mode 100644 index 0000000000..1d31636a85 --- /dev/null +++ b/qcsrc/server/bot/_all.qh @@ -0,0 +1,4 @@ +#pragma once +#include "_mod.qh" + +#include "default/_all.qh" diff --git a/qcsrc/server/bot/api.qc b/qcsrc/server/bot/api.qc index 85b0e46568..274b034033 100644 --- a/qcsrc/server/bot/api.qc +++ b/qcsrc/server/bot/api.qc @@ -1,49 +1 @@ #include "api.qh" - -#if 1 - -#include "default/_mod.inc" -#include "default/havocbot/_mod.inc" - -#else - -bool bot_aim(entity this, float shotspeed, float shotspeedupward, float maxshottime, float applygravity) { return false; } -void bot_clientconnect(entity this) { } -void bot_clientdisconnect(entity this) { } -void bot_cmdhelp(string scmd) { } -void bot_endgame() { } -bool bot_fixcount() { return true; } -void bot_list_commands() { } -void bot_queuecommand(entity bot, string cmdstring) { } -void bot_relinkplayerlist() { } -void bot_resetqueues() { } -void bot_serverframe() { } -bool bot_shouldattack(entity this, entity e) { return false; } -void bot_think(entity this) { } - -entity find_bot_by_name(string name) { return NULL; } -entity find_bot_by_number(float number) { return NULL; } - -void havocbot_goalrating_controlpoints(entity this, float ratingscale, vector org, float sradius) { } -void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org, float sradius) { } -void havocbot_goalrating_items(entity this, float ratingscale, vector org, float sradius) { } - -entity navigation_findnearestwaypoint(entity ent, float walkfromwp) { return NULL; } -void navigation_goalrating_end(entity this) { } -void navigation_goalrating_start(entity this) { } -void navigation_markroutes(entity this, entity fixed_source_waypoint) { } -void navigation_markroutes_inverted(entity fixed_source_waypoint) { } -void navigation_routerating(entity this, entity e, float f, float rangebias) { } - -bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float movemode) { return false; } - -void waypoint_remove(entity e) { } -void waypoint_saveall() { } -void waypoint_schedulerelinkall() { } -void waypoint_schedulerelink(entity wp) { } -void waypoint_spawnforitem(entity e) { } -void waypoint_spawnforitem_force(entity e, vector org) { } -void waypoint_spawnforteleporter(entity e, vector destination, float timetaken) { } -void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken) { } -entity waypoint_spawn(vector m1, vector m2, float f) { return NULL; } -#endif diff --git a/qcsrc/server/bot/default/_all.inc b/qcsrc/server/bot/default/_all.inc new file mode 100644 index 0000000000..f856187bb1 --- /dev/null +++ b/qcsrc/server/bot/default/_all.inc @@ -0,0 +1,4 @@ +#include +#include "_mod.inc" + +#include "havocbot/_all.inc" diff --git a/qcsrc/server/bot/default/_all.qh b/qcsrc/server/bot/default/_all.qh new file mode 100644 index 0000000000..43706ce245 --- /dev/null +++ b/qcsrc/server/bot/default/_all.qh @@ -0,0 +1,4 @@ +#pragma once +#include "_mod.qh" + +#include "havocbot/_all.qh" diff --git a/qcsrc/server/bot/default/havocbot/_all.inc b/qcsrc/server/bot/default/havocbot/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/server/bot/default/havocbot/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/server/bot/default/havocbot/_all.qh b/qcsrc/server/bot/default/havocbot/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/server/bot/default/havocbot/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/server/bot/null/bot_null.qc b/qcsrc/server/bot/null/bot_null.qc new file mode 100644 index 0000000000..75a7bcd111 --- /dev/null +++ b/qcsrc/server/bot/null/bot_null.qc @@ -0,0 +1,41 @@ +#include "bot_null.qh" + +bool bot_aim(entity this, float shotspeed, float shotspeedupward, float maxshottime, float applygravity) { return false; } +void bot_clientconnect(entity this) { } +void bot_clientdisconnect(entity this) { } +void bot_cmdhelp(string scmd) { } +void bot_endgame() { } +bool bot_fixcount() { return true; } +void bot_list_commands() { } +void bot_queuecommand(entity bot, string cmdstring) { } +void bot_relinkplayerlist() { } +void bot_resetqueues() { } +void bot_serverframe() { } +bool bot_shouldattack(entity this, entity e) { return false; } +void bot_think(entity this) { } + +entity find_bot_by_name(string name) { return NULL; } +entity find_bot_by_number(float number) { return NULL; } + +void havocbot_goalrating_controlpoints(entity this, float ratingscale, vector org, float sradius) { } +void havocbot_goalrating_enemyplayers(entity this, float ratingscale, vector org, float sradius) { } +void havocbot_goalrating_items(entity this, float ratingscale, vector org, float sradius) { } + +entity navigation_findnearestwaypoint(entity ent, float walkfromwp) { return NULL; } +void navigation_goalrating_end(entity this) { } +void navigation_goalrating_start(entity this) { } +void navigation_markroutes(entity this, entity fixed_source_waypoint) { } +void navigation_markroutes_inverted(entity fixed_source_waypoint) { } +void navigation_routerating(entity this, entity e, float f, float rangebias) { } + +bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float movemode) { return false; } + +void waypoint_remove(entity e) { } +void waypoint_saveall() { } +void waypoint_schedulerelinkall() { } +void waypoint_schedulerelink(entity wp) { } +void waypoint_spawnforitem(entity e) { } +void waypoint_spawnforitem_force(entity e, vector org) { } +void waypoint_spawnforteleporter(entity e, vector destination, float timetaken) { } +void waypoint_spawnforteleporter_v(entity e, vector org, vector destination, float timetaken) { } +entity waypoint_spawn(vector m1, vector m2, float f) { return NULL; } diff --git a/qcsrc/server/bot/null/bot_null.qh b/qcsrc/server/bot/null/bot_null.qh new file mode 100644 index 0000000000..28709a2b2e --- /dev/null +++ b/qcsrc/server/bot/null/bot_null.qh @@ -0,0 +1,3 @@ +#pragma once + +#include "../api.qh" diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 0a608e979b..a280b275e4 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2489,6 +2489,8 @@ void DrownPlayer(entity this) } } +.bool move_qcphysics; + void Player_Physics(entity this) { set_movetype(this, ((this.move_qcphysics) ? MOVETYPE_NONE : this.move_movetype)); diff --git a/qcsrc/server/command/_all.inc b/qcsrc/server/command/_all.inc new file mode 100644 index 0000000000..b90bed8cd7 --- /dev/null +++ b/qcsrc/server/command/_all.inc @@ -0,0 +1,4 @@ +#include +#include "_mod.inc" + +#include diff --git a/qcsrc/server/command/_all.qh b/qcsrc/server/command/_all.qh new file mode 100644 index 0000000000..9b89bcdc10 --- /dev/null +++ b/qcsrc/server/command/_all.qh @@ -0,0 +1,4 @@ +#pragma once +#include "_mod.qh" + +#include diff --git a/qcsrc/server/command/_mod.inc b/qcsrc/server/command/_mod.inc index fa15432311..2cabd69c7f 100644 --- a/qcsrc/server/command/_mod.inc +++ b/qcsrc/server/command/_mod.inc @@ -1,5 +1,4 @@ // generated file; do not modify -#include #include #include #ifdef SVQC @@ -8,4 +7,5 @@ #include #include #include +#include #include diff --git a/qcsrc/server/command/_mod.qh b/qcsrc/server/command/_mod.qh index 60e34ffe52..b95b1e0a6e 100644 --- a/qcsrc/server/command/_mod.qh +++ b/qcsrc/server/command/_mod.qh @@ -1,8 +1,8 @@ // generated file; do not modify -#include #include #include #include #include #include +#include #include diff --git a/qcsrc/server/command/all.qc b/qcsrc/server/command/all.qc deleted file mode 100644 index bc15eeb689..0000000000 --- a/qcsrc/server/command/all.qc +++ /dev/null @@ -1,2 +0,0 @@ -#include "all.qh" -#include diff --git a/qcsrc/server/command/all.qh b/qcsrc/server/command/all.qh deleted file mode 100644 index cde5ef367a..0000000000 --- a/qcsrc/server/command/all.qh +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include -REGISTRY(SERVER_COMMANDS, BITS(7)) -#define SERVER_COMMANDS_from(i) _SERVER_COMMANDS_from(i, NULL) -REGISTER_REGISTRY(SERVER_COMMANDS) -REGISTRY_SORT(SERVER_COMMANDS) - -#define SERVER_COMMAND(id, description) \ - CLASS(servercommand_##id, Command) \ - ATTRIB(servercommand_##id, m_name, string, #id); \ - ATTRIB(servercommand_##id, m_description, string, description); \ - ENDCLASS(servercommand_##id) \ - REGISTER(SERVER_COMMANDS, CMD_SV, id, m_id, NEW(servercommand_##id)); \ - METHOD(servercommand_##id, m_invokecmd, void(servercommand_##id this, int request, entity caller, int arguments, string command)) - -STATIC_INIT(SERVER_COMMANDS_aliases) { - FOREACH(SERVER_COMMANDS, true, LAMBDA(localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_sv")))); -} - -#include "sv_cmd.qh" - -#include "banning.qh" -#include "cmd.qh" -#include "common.qh" -#include "getreplies.qh" -#include "radarmap.qh" -#include "vote.qh" diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc index d6968c262d..d450ca4c85 100644 --- a/qcsrc/server/command/banning.qc +++ b/qcsrc/server/command/banning.qc @@ -1,5 +1,5 @@ #include "banning.qh" -#include +#include #include "banning.qh" #include "common.qh" diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 13c883f36b..33f5716658 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -1,5 +1,5 @@ #include "cmd.qh" -#include +#include #include "common.qh" #include "vote.qh" diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index d980a0f4cf..8f5b619fd0 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -1,5 +1,5 @@ #include "common.qh" -#include +#include #include "common.qh" #include "../scores.qh" diff --git a/qcsrc/server/command/common.qh b/qcsrc/server/command/common.qh index 63b1c708f2..0c09006ee3 100644 --- a/qcsrc/server/command/common.qh +++ b/qcsrc/server/command/common.qh @@ -1,6 +1,6 @@ #pragma once -#include +#include REGISTRY(COMMON_COMMANDS, BITS(7)) #define COMMON_COMMANDS_from(i) _COMMON_COMMANDS_from(i, NULL) REGISTER_REGISTRY(COMMON_COMMANDS) @@ -21,8 +21,7 @@ STATIC_INIT(COMMON_COMMANDS_aliases) { #include "vote.qh" #include -#include -#include +#include // ============================================================ // Shared declarations for server commands, written by Samual diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc index 93ce85a61a..1274fcf5f7 100644 --- a/qcsrc/server/command/getreplies.qc +++ b/qcsrc/server/command/getreplies.qc @@ -1,5 +1,5 @@ #include "getreplies.qh" -#include +#include #include "getreplies.qh" #include "../race.qh" diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc index 71f5e270b1..5f7533d7d9 100644 --- a/qcsrc/server/command/radarmap.qc +++ b/qcsrc/server/command/radarmap.qc @@ -1,5 +1,5 @@ #include "radarmap.qh" -#include +#include #include "radarmap.qh" #include "../g_world.qh" diff --git a/qcsrc/server/command/reg.qc b/qcsrc/server/command/reg.qc new file mode 100644 index 0000000000..c0af5b5e09 --- /dev/null +++ b/qcsrc/server/command/reg.qc @@ -0,0 +1 @@ +#include "reg.qh" diff --git a/qcsrc/server/command/reg.qh b/qcsrc/server/command/reg.qh new file mode 100644 index 0000000000..b135c04601 --- /dev/null +++ b/qcsrc/server/command/reg.qh @@ -0,0 +1,18 @@ +#pragma once + +REGISTRY(SERVER_COMMANDS, BITS(7)) +#define SERVER_COMMANDS_from(i) _SERVER_COMMANDS_from(i, NULL) +REGISTER_REGISTRY(SERVER_COMMANDS) +REGISTRY_SORT(SERVER_COMMANDS) + +#define SERVER_COMMAND(id, description) \ + CLASS(servercommand_##id, Command) \ + ATTRIB(servercommand_##id, m_name, string, #id); \ + ATTRIB(servercommand_##id, m_description, string, description); \ + ENDCLASS(servercommand_##id) \ + REGISTER(SERVER_COMMANDS, CMD_SV, id, m_id, NEW(servercommand_##id)); \ + METHOD(servercommand_##id, m_invokecmd, void(servercommand_##id this, int request, entity caller, int arguments, string command)) + +STATIC_INIT(SERVER_COMMANDS_aliases) { + FOREACH(SERVER_COMMANDS, true, LAMBDA(localcmd(sprintf("alias %1$s \"%2$s %1$s ${* ?}\"\n", it.m_name, "qc_cmd_sv")))); +} diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index bb59566d2a..720ad01f63 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -1,5 +1,5 @@ #include "sv_cmd.qh" -#include "all.qh" +#include "_all.qh" #include "banning.qh" #include "cmd.qh" diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 72bedd982c..f93e9c7182 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -1,5 +1,5 @@ #include "vote.qh" -#include +#include #include "vote.qh" #include "common.qh" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index fb782ed5c6..a177cdc64e 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -9,7 +9,7 @@ #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" -#include "../common/command/generic.qh" +#include "../common/command/_all.qh" #include "../common/constants.qh" #include "../common/deathtypes/all.qh" #include "../common/mapinfo.qh" diff --git a/qcsrc/server/mutators/_all.inc b/qcsrc/server/mutators/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/server/mutators/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/server/mutators/_all.qh b/qcsrc/server/mutators/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/server/mutators/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/server/mutators/all.qc b/qcsrc/server/mutators/all.qc index 78ba560265..0e8a607ebb 100644 --- a/qcsrc/server/mutators/all.qc +++ b/qcsrc/server/mutators/all.qc @@ -10,10 +10,7 @@ #include #include #include - #include - #include - #include - #include + #include #include #include #include diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh index 1e60b203e3..85910ced8c 100644 --- a/qcsrc/server/mutators/gamemode.qh +++ b/qcsrc/server/mutators/gamemode.qh @@ -13,12 +13,10 @@ #include -#include +#include #include -#include - #include #include diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh index a63321a36a..5344a91bb1 100644 --- a/qcsrc/server/mutators/mutator.qh +++ b/qcsrc/server/mutators/mutator.qh @@ -13,8 +13,7 @@ #include -#include -#include +#include #include #include diff --git a/qcsrc/server/mutators/mutator/_all.inc b/qcsrc/server/mutators/mutator/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/server/mutators/mutator/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/server/mutators/mutator/_all.qh b/qcsrc/server/mutators/mutator/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/server/mutators/mutator/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/server/mutators/mutator/gamemode_lms.qc b/qcsrc/server/mutators/mutator/gamemode_lms.qc index afd107bc43..a66a8c5365 100644 --- a/qcsrc/server/mutators/mutator/gamemode_lms.qc +++ b/qcsrc/server/mutators/mutator/gamemode_lms.qc @@ -43,7 +43,7 @@ float LMS_NewPlayerLives(); #include #include -#include +#include int autocvar_g_lms_extra_lives; bool autocvar_g_lms_join_anytime; diff --git a/qcsrc/server/pathlib/_all.inc b/qcsrc/server/pathlib/_all.inc index 7a06615bf3..73539f9ee9 100644 --- a/qcsrc/server/pathlib/_all.inc +++ b/qcsrc/server/pathlib/_all.inc @@ -1,6 +1,4 @@ -#ifndef DEBUGPATHING - #define DEBUGPATHING 0 -#endif +#include "pathlib.qh" #include "costs.qc" #include "expandnode.qc" diff --git a/qcsrc/server/pathlib/_all.qh b/qcsrc/server/pathlib/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/server/pathlib/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/server/pathlib/pathlib.qh b/qcsrc/server/pathlib/pathlib.qh index 339a2e7e0e..4ae0c2c86d 100644 --- a/qcsrc/server/pathlib/pathlib.qh +++ b/qcsrc/server/pathlib/pathlib.qh @@ -1,5 +1,9 @@ #pragma once +#ifndef DEBUGPATHING + #define DEBUGPATHING 0 +#endif + .entity pathlib_list; .entity path_next; .entity path_prev; diff --git a/qcsrc/server/progs.inc b/qcsrc/server/progs.inc index c49b604e69..743f981edb 100644 --- a/qcsrc/server/progs.inc +++ b/qcsrc/server/progs.inc @@ -1,30 +1,7 @@ -#ifndef DEBUGPATHING - #define DEBUGPATHING 0 -#endif - #include #if XONOTIC - -#include "_all.qh" - -#include "../server/_mod.inc" -#include "bot/_mod.inc" -#include "command/_mod.inc" -#include "mutators/_mod.inc" -#include "pathlib/_all.inc" -#include "weapons/_mod.inc" - -#include -#include - -#include - -#include -#include -#include -#include - +#include "_all.inc" #endif #include diff --git a/qcsrc/server/tests.qh b/qcsrc/server/tests.qh index be6445b48e..ec56918c79 100644 --- a/qcsrc/server/tests.qh +++ b/qcsrc/server/tests.qh @@ -2,7 +2,7 @@ #include "autocvars.qh" #include "cl_client.qh" -#include "command/all.qh" +#include "command/_all.qh" #include "weapons/common.qh" #include "weapons/selection.qh" #include diff --git a/qcsrc/server/weapons/_all.inc b/qcsrc/server/weapons/_all.inc new file mode 100644 index 0000000000..8bc63f720a --- /dev/null +++ b/qcsrc/server/weapons/_all.inc @@ -0,0 +1,2 @@ +#include "_all.qh" +#include "_mod.inc" diff --git a/qcsrc/server/weapons/_all.qh b/qcsrc/server/weapons/_all.qh new file mode 100644 index 0000000000..947026dd59 --- /dev/null +++ b/qcsrc/server/weapons/_all.qh @@ -0,0 +1,2 @@ +#pragma once +#include "_mod.qh" diff --git a/qcsrc/tools/auto-super.pl b/qcsrc/tools/auto-super.pl new file mode 100644 index 0000000000..00926d0617 --- /dev/null +++ b/qcsrc/tools/auto-super.pl @@ -0,0 +1,101 @@ +my %classoffile = (); +my %classes = (); +my %baseclass = (); +my %methods = (); +my %attrs = (); +my %methodnames = (); +my %old2new = (); + +print STDERR "Scanning...\n"; +for my $f(@ARGV) +{ + open my $fh, '<', $f; + while(<$fh>) + { + if(/^CLASS\(([^)]*)\)(?:\s*EXTENDS\(([^)]*)\))?/) + { + $classes{$1} = defined($2) ? $2 : "Object"; + $classoffile{$f} = $1; + } + if(/^\s*METHOD\(([^),]*),\s*([^),]*)/) + { + $methods{$1}{$2} = $1; + $methodnames{"$1"."_"."$2"} = $f; + $old2new{"$2$1"} = "$1"."_"."$2"; + } + if(/^\s*ATTRIB(?:ARRAY)?\(([^),]*),\s*([^),]*)/) + { + $attrs{$1}{$2} = $1; + } + } + close $fh; +} + +# propagate down methods etc. +print STDERR "Propagating...\n"; +for my $class(keys %classes) +{ + print STDERR "$class"; + my $base = $class; + for(;;) + { + $base = $classes{$base}; + last if not defined $base; + print STDERR " -> $base"; + while(my ($method, $definingclass) = each %{$methods{$base}}) + { + $methods{$class}{$method} = $definingclass + if not defined $methods{$class}{$method}; + } + while(my ($attr, $definingclass) = each %{$attrs{$base}}) + { + $attrs{$class}{$attr} = $definingclass + if not defined $attrs{$class}{$attr}; + } + } + print STDERR "\n"; +} + +# change all calls to base method to super, complain about skipping +print STDERR "Fixing...\n"; +for my $f(@ARGV) +{ + open my $fh, '<', $f; + my $s = do { undef local $/; <$fh>; }; + my $s0 = $s; + close $fh; + + my $class = $classoffile{$f}; + my $base = $classes{$class}; + next if not defined $base; + + for(keys %old2new) + { + $s =~ s/\b$_\b/$old2new{$_}/g; + } + + my @methods_super = map { [ $methods{$base}{$_} . "_" . $_, "SUPER($class).$_" ]; } keys %{$methods{$base}}; + for(@methods_super) + { + my ($search, $replace) = @$_; + my $n = ($s =~ s/\b$search\b/$replace/g); + print STDERR "[$f] $search -> $replace... $n replacements\n" + if $n; + } + + for(grep { $methodnames{$_} ne $f } keys %methodnames) + { + if($s =~ /\b$_\b/) + { + print STDERR "[$f] calls non-super external method directly: $_\n"; + } + } + + if($s ne $s0) + { + print STDERR "Rewriting $f...\n"; + open my $fh, '>', $f; + print $fh $s; + close $fh; + } +} diff --git a/qcsrc/tools/compilationunits.sh b/qcsrc/tools/compilationunits.sh index 2fa17825ec..cccb938567 100755 --- a/qcsrc/tools/compilationunits.sh +++ b/qcsrc/tools/compilationunits.sh @@ -11,7 +11,6 @@ declare -a QCCDEFS=( -DNDEBUG=1 -DXONOTIC=1 -DWATERMARK="\"$(git describe --tags --dirty='~')\"" - -DDEBUGPATHING=0 ) QCCDEFS="${QCCDEFS[@]}" diff --git a/qcsrc/tools/headerstyle.sh b/qcsrc/tools/headerstyle.sh index daf20ebf3b..e40fb392a8 100755 --- a/qcsrc/tools/headerstyle.sh +++ b/qcsrc/tools/headerstyle.sh @@ -28,8 +28,23 @@ 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 + +# TODO: check that "_mod.(qc|inc)" is not included except by "_all.(qc|inc)"