Merge branch 'master' into morphed/hagar

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / progs.inc

diff --git a/qcsrc/menu/progs.inc b/qcsrc/menu/progs.inc
index 45c52c8c02b34dfe10f61adc81d224962ec49c74..621c1a4899cb104e142858b254207d8e558f111f 100644 (file)
--- a/qcsrc/menu/progs.inc
+++ b/qcsrc/menu/progs.inc
@@ -1,11 +1,8 @@
-#include "../common/util-pre.qh"
-#include "../dpdefs/menudefs.qh"
-#include "../dpdefs/keycodes.qh"
-#include "../common/util-post.qh"
-
 #include "../lib/_all.inc"
 
-#include "oo/classes.qc"
+#define world NULL
+
+#include "classes.qc"
 
 #include "draw.qc"
 #include "menu.qc"
@@ -14,16 +11,8 @@
 
 #include "xonotic/util.qc"
 
-#include "../common/campaign_file.qc"
-#include "../common/campaign_setup.qc"
-#include "../common/mapinfo.qc"
-#include "../common/playerstats.qc"
-#include "../common/util.qc"
-
-#include "../common/items/all.qc"
-#include "../common/monsters/all.qc"
-#include "../common/mutators/all.qc"
-#include "../common/vehicles/all.qc"
-#include "../common/weapons/all.qc"
+#include "../common/_all.inc"
 
-#include "../mod/menu/progs.inc"
+#if BUILD_MOD
+#include "../../mod/menu/progs.inc"
+#endif