Merge branch 'Mario/spiderbot_no_sprint' into 'master'

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

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 1edf6bfbaf261fbc59a3ba57dbe72d61bceba507..4d2d6d45035b6d892217580dc75fef9202b80e16 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -79,17 +79,6 @@ void m_init()
 
        CheckEngineExtensions();
 
-       // list all game dirs (TEST)
-       if (cvar("developer") > 0)
-       {
-               for (int i = 0; ; ++i)
-               {
-                       string s = getgamedirinfo(i, GETGAMEDIRINFO_NAME);
-                       if (!s) break;
-                       LOG_TRACE(s, ": ", getgamedirinfo(i, GETGAMEDIRINFO_DESCRIPTION));
-               }
-       }
-
        registercvar("_menu_cmd_closemenu_available", "0", 0);
        cvar_set("_menu_cmd_closemenu_available", "1");
 
@@ -920,6 +909,10 @@ void m_toggle(int mode)
        if (Menu_Active)
        {
                if (mode == 1) return;
+               // when togglemenu is called without arguments (mode is -1)
+               // the menu is closed only when connected
+               if (mode == -1 && !(gamestatus & GAME_CONNECTED)) return;
+               // togglemenu 0 always closes the menu
                m_hide();
        }
        else