Clean up MENUQC #includes
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Jan 2015 03:44:56 +0000 (14:44 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Jan 2015 03:44:56 +0000 (14:44 +1100)
13 files changed:
qcsrc/common/command/generic.qc
qcsrc/common/monsters/monsters.qc
qcsrc/menu/anim/animhost.qc
qcsrc/menu/command/menu_cmd.qc
qcsrc/menu/config.qh [deleted file]
qcsrc/menu/menu.qh
qcsrc/menu/progs.src
qcsrc/menu/xonotic/campaign.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qc
qcsrc/menu/xonotic/slider_decibels.qc
qcsrc/menu/xonotic/statslist.qc
qcsrc/menu/xonotic/util.qc

index a5181cc..931e2f6 100644 (file)
@@ -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
index 61f2f7c..096c2e5 100644 (file)
@@ -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
index ae84e09..c46334d 100644 (file)
@@ -1,3 +1,5 @@
+#include "../menu.qh"
+
 #ifdef INTERFACE
 CLASS(AnimHost) EXTENDS(Object)
        METHOD(AnimHost, addAnim, void(entity, entity))
index 0f8d83c..bc044a2 100644 (file)
@@ -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
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#endif
\ No newline at end of file
index 47b2ed9..4ff3236 100644 (file)
@@ -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)
index 1f0aa1c..dc74a02 100644 (file)
@@ -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
index 7584434..885c891 100644 (file)
@@ -1,3 +1,5 @@
+#include "../../common/campaign_common.qh"
+
 #ifdef INTERFACE
 CLASS(XonoticCampaignList) EXTENDS(XonoticListBox)
        METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity))
index 6bca47f..d7825e0 100644 (file)
@@ -1,3 +1,5 @@
+#include "../../common/weapons/weapons.qh"
+
 #ifdef INTERFACE
 CLASS(XonoticMutatorsDialog) EXTENDS(XonoticDialog)
        METHOD(XonoticMutatorsDialog, toString, string(entity))
index fa5e306..dabb1be 100644 (file)
@@ -1,3 +1,5 @@
+#include "../../common/mapinfo.qh"
+
 #ifdef INTERFACE
 CLASS(XonoticServerInfoDialog) EXTENDS(XonoticDialog)
        METHOD(XonoticServerInfoDialog, fill, void(entity))
index bf847e3..0763232 100644 (file)
@@ -1,3 +1,5 @@
+#include "../../warpzonelib/mathlib.qh"
+
 #ifdef INTERFACE
 CLASS(XonoticDecibelsSlider) EXTENDS(XonoticSlider)
        METHOD(XonoticDecibelsSlider, loadCvars, void(entity))
index 68f9512..f80e8ff 100644 (file)
@@ -1,3 +1,6 @@
+#include "../../common/counting.qh"
+#include "../../common/playerstats.qh"
+
 #ifdef INTERFACE
 CLASS(XonoticStatsList) EXTENDS(XonoticListBox)
        METHOD(XonoticStatsList, configureXonoticStatsList, void(entity))
index f7e8a41..0eb5b21 100644 (file)
@@ -1,7 +1,4 @@
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-#endif
+#include "../../common/urllib.qh"
 
 float GL_CheckExtension(string ext)
 {