patch from VorteX which removes special menu behavior for
[xonotic/darkplaces.git] / menu.c
diff --git a/menu.c b/menu.c
index 7bde1b9..fd0d3a1 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -371,8 +371,6 @@ void M_Menu_Main_f (void)
                else
                        MAIN_ITEMS = 6;
        }
-       else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
-               MAIN_ITEMS = 6;
        else if (gamemode == GAME_TRANSFUSION)
        {
                s = "gfx/menu/mainmenu1";
@@ -600,34 +598,6 @@ static void M_Main_Key (int key, char ascii)
                                break;
                        }
                }
-               else if (gamemode == GAME_NETHERWORLD)//VORTEX: menu restarting item
-               {
-                       switch (m_main_cursor)
-                       {
-                       case 0:
-                               M_Menu_SinglePlayer_f ();
-                               break;
-
-                       case 1:
-                               M_Menu_MultiPlayer_f ();
-                               break;
-
-                       case 2:
-                               M_Menu_Options_f ();
-                               break;
-
-                       case 3:
-                               M_Menu_Help_f ();
-                               break;
-
-                       case 4:
-                               M_Menu_Quit_f ();
-                               break;
-                       case 5:
-                               MR_Restart();
-                               break;
-                       }
-               }
                else if (gamemode == GAME_TRANSFUSION) {
                        if (MAIN_ITEMS == 7)
                        {
@@ -5259,8 +5229,6 @@ void MR_Init_Commands(void)
        // set router console commands
        Cvar_RegisterVariable (&forceqmenu);
        Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
-       if (gamemode == GAME_NETHERWORLD)
-               Cmd_AddCommand ("menu_fallback", MP_Fallback, "switch to engine menu (unload menu.dat)");
        Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat");
        Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu");
 }