shuffled cl_light and some of cl_tent into cl_main and remaining cl_tent code into...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index f17c79fd9d3ae0e4cb3a76fde9e7ae033ab4c72c..1cb2aee65e45a016e71bdf77464d89eb57f1d78a 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -275,7 +275,7 @@ void M_DrawTextBox (float x, float y, float width, float height)
 
 //=============================================================================
 
-int m_save_demonum;
+//int m_save_demonum;
 
 /*
 ================
@@ -297,14 +297,10 @@ void M_ToggleMenu_f (void)
                m_state = m_none;
                return;
        }
-       if (key_dest == key_console)
-       {
-               Con_ToggleConsole_f ();
-       }
-       else
-       {
+       //if (key_dest == key_console)
+       //      Con_ToggleConsole_f ();
+       //else
                M_Menu_Main_f ();
-       }
 }
 
 
@@ -382,11 +378,13 @@ void M_Menu_Main_f (void)
        else
                MAIN_ITEMS = 5;
 
+       /*
        if (key_dest != key_menu)
        {
                m_save_demonum = cls.demonum;
                cls.demonum = -1;
        }
+       */
        key_dest = key_menu;
        m_state = m_main;
        m_entersound = true;
@@ -427,9 +425,9 @@ void M_Main_Key (int key)
        case K_ESCAPE:
                key_dest = key_game;
                m_state = m_none;
-               cls.demonum = m_save_demonum;
-               if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
-                       CL_NextDemo ();
+               //cls.demonum = m_save_demonum;
+               //if (cls.demonum != -1 && !cls.demoplayback && cls.state != ca_connected)
+               //      CL_NextDemo ();
                break;
 
        case K_DOWNARROW:
@@ -2131,7 +2129,6 @@ void M_Quit_Key (int key)
 
        case 'Y':
        case 'y':
-               key_dest = key_console;
                Host_Quit_f ();
                break;
 
@@ -2637,7 +2634,7 @@ void M_Menu_GameOptions_f (void)
        if (maxplayers == 0)
                maxplayers = svs.maxclients;
        if (maxplayers < 2)
-               maxplayers = svs.maxclientslimit;
+               maxplayers = MAX_SCOREBOARD;
 }
 
 
@@ -2786,9 +2783,9 @@ void M_NetStart_Change (int dir)
        {
        case 1:
                maxplayers += dir;
-               if (maxplayers > svs.maxclientslimit)
+               if (maxplayers > MAX_SCOREBOARD)
                {
-                       maxplayers = svs.maxclientslimit;
+                       maxplayers = MAX_SCOREBOARD;
                        m_serverInfoMessage = true;
                        m_serverInfoMessageTime = realtime;
                }