Clean up MENUQC #includes

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index a5181ccbac6ce3afa35d1adef9ef77bfd51535cb..931e2f679fa1c32ea77d824333507c2a4772995c 100644 (file)
--- 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 61f2f7c1eb23d5c60ad83debf34e01a668f8d802..096c2e5ea43a864874c37b9ce437215f8ae95e88 100644 (file)
--- 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 ae84e0957da7be5efaff03271861b81b5810d6c4..c46334d530aed763cd3e0c8706e387131e0d1730 100644 (file)
--- 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 0f8d83ce565c10ec5be5998f0137c09c84bd6b2a..bc044a2aa585b54d4ed915f7b403e5943ff6d983 100644 (file)
--- 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 (file)
index 86203cf..0000000
--- 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 47b2ed9dd149c8138d02e4b5e5216d3c89d0a7be..4ff32361e9c7bf0a2dee8c941f5c2ee5542bb652 100644 (file)
--- 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 1f0aa1c68ae7e8e8f5c5b5ddf0434f3d6b101881..dc74a02cebd5004edd405d41d10affa344e6426d 100644 (file)
--- 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 75844340eb47537fd9a61bb7eff370c3c5bc7e50..885c89183cf548543cf7af27a2479ff355c60e08 100644 (file)
--- 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 6bca47f05fd75745fcd4f874208d118fdaa3afa1..d7825e06a395705cdac822d833107c6943a488fc 100644 (file)
--- 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 fa5e30682f1d6f126f5413e65ae552af116826af..dabb1be541bf3b50131d7ef827e61dc9aae7d890 100644 (file)
--- 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 bf847e31264765b9a4ed63e200c0ba80505ada51..07632320ed29d89da88f90d7e914c00576833b35 100644 (file)
--- 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 68f951218a5a28c7ca1f1c3b249be9f7e7f4b388..f80e8ffa037a172988850d615b628fbaf8a03cff 100644 (file)
--- 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 f7e8a41a6020d397c737ff030664681bbe0207ac..0eb5b215caf64888b8b680c0147942472c5a0fb7 100644 (file)
--- 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)
 {