Revert "Revert "Build in subdirs"", as the issues seem to be ironed out now.

[xonotic/darkplaces.git] / host_cmd.c

diff --git a/host_cmd.c b/host_cmd.c
index 5e8daba3609ca46a058886a3486f5a3e9d62a31b..d14fc9078104171c386c93258324dcbec5ec9326 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -379,9 +379,11 @@ static void Host_Map_f (void)
                svs.clients = (client_t *)Mem_Alloc(sv_mempool, sizeof(client_t) * svs.maxclients);
        }
 
+#ifdef CONFIG_MENU
        // remove menu
        if (key_dest == key_menu || key_dest == key_menu_grabbed)
                MR_ToggleMenu(0);
+#endif
        key_dest = key_game;
 
        svs.serverflags = 0;                    // haven't completed an episode yet
@@ -414,9 +416,11 @@ static void Host_Changelevel_f (void)
                return;
        }
 
+#ifdef CONFIG_MENU
        // remove menu
        if (key_dest == key_menu || key_dest == key_menu_grabbed)
                MR_ToggleMenu(0);
+#endif
        key_dest = key_game;
 
        SV_SaveSpawnparms ();
@@ -449,9 +453,11 @@ static void Host_Restart_f (void)
                return;
        }
 
+#ifdef CONFIG_MENU
        // remove menu
        if (key_dest == key_menu || key_dest == key_menu_grabbed)
                MR_ToggleMenu(0);
+#endif
        key_dest = key_game;
 
        allowcheats = sv_cheats.integer != 0;
@@ -792,9 +798,11 @@ static void Host_Loadgame_f (void)
        if (cls.demoplayback)
                CL_Disconnect ();
 
+#ifdef CONFIG_MENU
        // remove menu
        if (key_dest == key_menu || key_dest == key_menu_grabbed)
                MR_ToggleMenu(0);
+#endif
        key_dest = key_game;
 
        cls.demonum = -1;               // stop demo loop in case this fails