Merge branch 'master' into terencehill/slider_anim_improvements

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / menu.qc

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 70f4249d038436088a5d5b05ab19aefdf23208a5..d01f6f7d4d0d2f986a288f1de66b2948219ba777 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -2,8 +2,10 @@
 #include "oo/classes.qc"
 #include "xonotic/util.qh"
 
+#include "../common/items/all.qh"
 #include "../common/weapons/all.qh"
 #include "../common/mapinfo.qh"
+#include "../common/mutators/base.qh"
 
 ///////////////////////////////////////////////
 // Menu Source File
@@ -79,8 +81,7 @@ void m_init()
        }
 
        // needs to be done so early because of the constants they create
-       CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
-       CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
+       static_init();
 
        RegisterSLCategories();