Merge branch 'master' into terencehill/slider_anim_improvements

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

diff --git a/qcsrc/menu/progs.src b/qcsrc/menu/progs.src
index e18aacd84fb867e1d324b57ed1244b8528130715..2bde451f8dc381aa80209319872bda56b69427be 100644 (file)
--- a/qcsrc/menu/progs.src
+++ b/qcsrc/menu/progs.src
@@ -1,20 +1,16 @@
 ../../menu.dat
 
 ../common/util-pre.qh
-sys-pre.qh
 ../dpdefs/menudefs.qh
 ../dpdefs/keycodes.qh
-sys-post.qh
+../common/util-post.qh
 
-oo/interface.qh
-       classes.qc
-oo/implementation.qh
-       classes.qc
+oo/classes.qc
 
 draw.qc
 menu.qc
 
-command/menu_cmd.qc
+command/all.qc
 
 xonotic/util.qc
 
@@ -26,12 +22,11 @@ xonotic/util.qc
 ../common/urllib.qc
 ../common/util.qc
 
-../common/command/generic.qc
-../common/command/markup.qc
-../common/command/rpn.qc
-
-../common/monsters/monsters.qc
-
-../common/weapons/weapons.qc // TODO
+../common/items/all.qc
+../common/monsters/all.qc
+../common/vehicles/all.qc
+../common/weapons/all.qc
 
 ../warpzonelib/mathlib.qc
+
+../../mod/menu/progs.inc