Merge branch 'maint' (early part before Transifex)

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

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