From 13a3ce5cdf01a322755b2f0e74d168cd5247d789 Mon Sep 17 00:00:00 2001 From: TimePath Date: Thu, 29 Jan 2015 14:44:56 +1100 Subject: [PATCH] Clean up MENUQC #includes --- qcsrc/common/command/generic.qc | 28 +--------- qcsrc/common/monsters/monsters.qc | 24 +-------- qcsrc/menu/anim/animhost.qc | 2 + qcsrc/menu/command/menu_cmd.qc | 12 ++--- qcsrc/menu/config.qh | 4 -- qcsrc/menu/menu.qh | 11 ++++ qcsrc/menu/progs.src | 53 ++++++------------- qcsrc/menu/xonotic/campaign.qc | 2 + .../dialog_multiplayer_create_mutators.qc | 2 + .../dialog_multiplayer_join_serverinfo.qc | 2 + qcsrc/menu/xonotic/slider_decibels.qc | 2 + qcsrc/menu/xonotic/statslist.qc | 3 ++ qcsrc/menu/xonotic/util.qc | 5 +- 13 files changed, 47 insertions(+), 103 deletions(-) delete mode 100644 qcsrc/menu/config.qh diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index a5181ccbac..931e2f679f 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -1,29 +1,5 @@ -#if defined(CSQC) - #include "../../dpdefs/csprogsdefs.qh" - #include "../constants.qh" - #include "../util.qh" - #include "../mapinfo.qh" - #include "generic.qh" - #include "shared_defs.qh" - #include "../../client/command/cl_cmd.qh" - #include "../notifications.qh" -#elif defined(MENUQC) -#elif defined(SVQC) - #include "../../dpdefs/progsdefs.qh" - #include "../../dpdefs/dpextensions.qh" - #include "../constants.qh" - #include "../util.qh" - #include "../test.qh" - #include "generic.qh" - #include "shared_defs.qh" - #include "../weapons/config.qh" - #include "../notifications.qh" - #include "../mapinfo.qh" - #include "../../server/command/common.qh" - #include "../../server/command/banning.qh" - #include "../../server/command/cmd.qh" - #include "../../server/command/sv_cmd.qh" -#endif +#include "generic.qh" +#include "shared_defs.qh" // ========================================================= // Generic program common command code, written by Samual diff --git a/qcsrc/common/monsters/monsters.qc b/qcsrc/common/monsters/monsters.qc index 61f2f7c1eb..096c2e5ea4 100644 --- a/qcsrc/common/monsters/monsters.qc +++ b/qcsrc/common/monsters/monsters.qc @@ -1,25 +1,5 @@ -#if defined(CSQC) - #include "../../dpdefs/csprogsdefs.qh" - #include "../weapons/weapons.qh" - #include "monsters.qh" -#elif defined(MENUQC) -#elif defined(SVQC) - #include "../../dpdefs/progsdefs.qh" - #include "../../dpdefs/dpextensions.qh" - #include "../../warpzonelib/server.qh" - #include "../constants.qh" - #include "../util.qh" - #include "monsters.qh" - #include "sv_monsters.qh" - #include "../weapons/weapons.qh" - #include "../../server/t_items.qh" - #include "../../server/autocvars.qh" - #include "../../server/constants.qh" - #include "../../server/defs.qh" - #include "../deathtypes.qh" - #include "../../server/mutators/mutators_include.qh" - #include "../../csqcmodellib/sv_model.qh" -#endif +#include "monsters.qh" + #include "all.qh" // MONSTER PLUGIN SYSTEM diff --git a/qcsrc/menu/anim/animhost.qc b/qcsrc/menu/anim/animhost.qc index ae84e0957d..c46334d530 100644 --- a/qcsrc/menu/anim/animhost.qc +++ b/qcsrc/menu/anim/animhost.qc @@ -1,3 +1,5 @@ +#include "../menu.qh" + #ifdef INTERFACE CLASS(AnimHost) EXTENDS(Object) METHOD(AnimHost, addAnim, void(entity, entity)) diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index 0f8d83ce56..bc044a2aa5 100644 --- a/qcsrc/menu/command/menu_cmd.qc +++ b/qcsrc/menu/command/menu_cmd.qc @@ -1,12 +1,6 @@ -#if defined(CSQC) -#elif defined(MENUQC) - #include "../../dpdefs/menudefs.qh" - #include "../../common/util.qh" - #include "../oo/base.qh" - #include "menu_cmd.qh" - #include "../menu.qh" -#elif defined(SVQC) -#endif +#include "menu_cmd.qh" + +#include "../../common/command/generic.qh" string _dumptree_space; void _dumptree_open(entity pass, entity me) diff --git a/qcsrc/menu/config.qh b/qcsrc/menu/config.qh deleted file mode 100644 index 86203cfdde..0000000000 --- a/qcsrc/menu/config.qh +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#endif \ No newline at end of file diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh index 47b2ed9dd1..4ff32361e9 100644 --- a/qcsrc/menu/menu.qh +++ b/qcsrc/menu/menu.qh @@ -1,6 +1,17 @@ #ifndef MENU_H #define MENU_H +#include "draw.qh" +#include "skin.qh" + +#include "oo/base.qh" + +#include "xonotic/util.qh" + +#include "../common/constants.qh" +#include "../common/test.qh" +#include "../common/util.qh" + #define localcmd cmd #define NULL (null_entity) diff --git a/qcsrc/menu/progs.src b/qcsrc/menu/progs.src index 1f0aa1c68a..dc74a02ceb 100644 --- a/qcsrc/menu/progs.src +++ b/qcsrc/menu/progs.src @@ -6,55 +6,32 @@ sys-pre.qh ../dpdefs/keycodes.qh sys-post.qh -config.qh - -../warpzonelib/mathlib.qh -../common/util.qh -../common/test.qh - -oo/base.qh - -../common/playerstats.qh -../common/teams.qh -../common/constants.qh -../common/mapinfo.qh -../common/campaign_common.qh -../common/weapons/weapons.qh // TODO -../common/counting.qh -../common/command/markup.qh -../common/command/rpn.qh -../common/command/generic.qh -../common/command/shared_defs.qh -../common/urllib.qh -../common/monsters/monsters.qh - -command/menu_cmd.qh -menu.qh -draw.qh -skin.qh -xonotic/util.qh - oo/interface.qh classes.qc oo/implementation.qh classes.qc -../common/util.qc -../common/test.qc -../common/playerstats.qc -../common/command/markup.qc -../common/command/rpn.qc -../common/command/generic.qc -command/menu_cmd.qc -menu.qc draw.qc +menu.qc + +command/menu_cmd.qc + xonotic/util.qc ../common/campaign_file.qc ../common/campaign_setup.qc ../common/mapinfo.qc -../common/weapons/weapons.qc // TODO +../common/playerstats.qc +../common/test.qc ../common/urllib.qc +../common/util.qc + +../common/command/generic.qc +../common/command/markup.qc +../common/command/rpn.qc + ../common/monsters/monsters.qc -../warpzonelib/mathlib.qc +../common/weapons/weapons.qc // TODO + +../warpzonelib/mathlib.qc \ No newline at end of file diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc index 75844340eb..885c89183c 100644 --- a/qcsrc/menu/xonotic/campaign.qc +++ b/qcsrc/menu/xonotic/campaign.qc @@ -1,3 +1,5 @@ +#include "../../common/campaign_common.qh" + #ifdef INTERFACE CLASS(XonoticCampaignList) EXTENDS(XonoticListBox) METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity)) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc index 6bca47f05f..d7825e06a3 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc @@ -1,3 +1,5 @@ +#include "../../common/weapons/weapons.qh" + #ifdef INTERFACE CLASS(XonoticMutatorsDialog) EXTENDS(XonoticDialog) METHOD(XonoticMutatorsDialog, toString, string(entity)) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc index fa5e30682f..dabb1be541 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc @@ -1,3 +1,5 @@ +#include "../../common/mapinfo.qh" + #ifdef INTERFACE CLASS(XonoticServerInfoDialog) EXTENDS(XonoticDialog) METHOD(XonoticServerInfoDialog, fill, void(entity)) diff --git a/qcsrc/menu/xonotic/slider_decibels.qc b/qcsrc/menu/xonotic/slider_decibels.qc index bf847e3126..07632320ed 100644 --- a/qcsrc/menu/xonotic/slider_decibels.qc +++ b/qcsrc/menu/xonotic/slider_decibels.qc @@ -1,3 +1,5 @@ +#include "../../warpzonelib/mathlib.qh" + #ifdef INTERFACE CLASS(XonoticDecibelsSlider) EXTENDS(XonoticSlider) METHOD(XonoticDecibelsSlider, loadCvars, void(entity)) diff --git a/qcsrc/menu/xonotic/statslist.qc b/qcsrc/menu/xonotic/statslist.qc index 68f951218a..f80e8ffa03 100644 --- a/qcsrc/menu/xonotic/statslist.qc +++ b/qcsrc/menu/xonotic/statslist.qc @@ -1,3 +1,6 @@ +#include "../../common/counting.qh" +#include "../../common/playerstats.qh" + #ifdef INTERFACE CLASS(XonoticStatsList) EXTENDS(XonoticListBox) METHOD(XonoticStatsList, configureXonoticStatsList, void(entity)) diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index f7e8a41a60..0eb5b215ca 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -1,7 +1,4 @@ -#if defined(CSQC) -#elif defined(MENUQC) -#elif defined(SVQC) -#endif +#include "../../common/urllib.qh" float GL_CheckExtension(string ext) { -- 2.39.2