Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

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

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index ff91f5359482f24761af700ef724d6bc0f6fe317..536295fc2f479f66dbdd08641c10a4a49330bac6 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -50,6 +50,10 @@ void m_init()
                        dprint(s, ": ", getgamedirinfo(i, GETGAMEDIRINFO_DESCRIPTION));
                }
        }
+
+       // needs to be done so early because of the constants they create
+       RegisterWeapons();
+       RegisterGametypes();
 }
 
 float MENU_ASPECT = 1.25; // 1280x1024
@@ -117,10 +121,6 @@ void m_init_delayed()
                return;
        menuInitialized = 1;
 
-       // needs to be done so early because of the constants they create
-       RegisterWeapons();
-       RegisterGametypes();
-
        fh = -1;
        if(cvar_string("menu_skin") != "")
        {