sv_aircontrol_penalty

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 754152cc10afd18aab5f98f3a2a18fe27a7c850b..c9e8d1fa4801a28e58be71c3ffeada3166ac2ce0 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -270,23 +270,23 @@ static void M_DrawTextBox(float x, float y, float width, float height)
 
 /*
 ================
-M_ToggleMenu_f
+M_ToggleMenu
 ================
 */
-void M_ToggleMenu_f (void)
+void M_ToggleMenu(int mode)
 {
        m_entersound = true;
 
        if ((key_dest != key_menu && key_dest != key_menu_grabbed) || m_state != m_main)
        {
-               if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "1"))
-                       return;
+               if(mode == 0)
+                       return; // the menu is off, and we want it off
                M_Menu_Main_f ();
        }
        else
        {
-               if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "0"))
-                       return;
+               if(mode == 1)
+                       return; // the menu is on, and we want it on
                key_dest = key_game;
                m_state = m_none;
        }
@@ -817,12 +817,13 @@ static int                loadable[MAX_SAVEGAMES];
 
 static void M_ScanSaves (void)
 {
-       int             i, j, len;
+       int             i, j;
+       size_t  len;
        char    name[MAX_OSPATH];
        char    buf[SAVEGAME_COMMENT_LENGTH + 256];
        const char *t;
        qfile_t *f;
-       int             version;
+//     int             version;
 
        for (i=0 ; i<MAX_SAVEGAMES ; i++)
        {
@@ -834,11 +835,12 @@ static void M_ScanSaves (void)
                        continue;
                // read enough to get the comment
                len = FS_Read(f, buf, sizeof(buf) - 1);
-               buf[sizeof(buf) - 1] = 0;
+               len = min(len, sizeof(buf)-1);
+               buf[len] = 0;
                t = buf;
                // version
                COM_ParseToken_Simple(&t, false, false);
-               version = atoi(com_token);
+               //version = atoi(com_token);
                // description
                COM_ParseToken_Simple(&t, false, false);
                strlcpy (m_filenames[i], com_token, sizeof (m_filenames[i]));
@@ -865,10 +867,16 @@ void M_Menu_Save_f (void)
 {
        if (!sv.active)
                return;
+#if 1
+       // LordHavoc: allow saving multiplayer games
+       if (cl.islocalgame && cl.intermission)
+               return;
+#else
        if (cl.intermission)
                return;
        if (!cl.islocalgame)
                return;
+#endif
        m_entersound = true;
        m_state = m_save;
        key_dest = key_menu;
@@ -2517,31 +2525,6 @@ void M_Menu_Keys_f (void)
 
 #define NUMKEYS 5
 
-void M_FindKeysForCommand (const char *command, int *keys)
-{
-       int             count;
-       int             j;
-       char    *b;
-
-       for (j = 0;j < NUMKEYS;j++)
-               keys[j] = -1;
-
-       count = 0;
-
-       for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); j++)
-       {
-               b = keybindings[0][j];
-               if (!b)
-                       continue;
-               if (!strcmp (b, command) )
-               {
-                       keys[count++] = j;
-                       if (count == NUMKEYS)
-                               break;
-               }
-       }
-}
-
 static void M_UnbindCommand (char *command)
 {
        int             j;
@@ -2591,7 +2574,7 @@ static void M_Keys_Draw (void)
                else
                        M_Print(16, y, bindnames[i][1]);
 
-               M_FindKeysForCommand (bindnames[i][0], keys);
+               Key_FindKeysForCommand (bindnames[i][0], keys, NUMKEYS, 0);
 
                // LordHavoc: redesigned to print more than 2 keys, inspired by Tomaz's MiniRacer
                if (keys[0] == -1)
@@ -2672,7 +2655,7 @@ static void M_Keys_Key (int k, int ascii)
                break;
 
        case K_ENTER:           // go into bind mode
-               M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
+               Key_FindKeysForCommand (bindnames[keys_cursor][0], keys, NUMKEYS, 0);
                S_LocalSound ("sound/misc/menu2.wav");
                if (keys[NUMKEYS - 1] != -1)
                        M_UnbindCommand (bindnames[keys_cursor][0]);
@@ -4400,9 +4383,10 @@ static void M_ServerList_Draw (void)
        {
                for (n = start;n < end;n++)
                {
+                       serverlist_entry_t *entry = ServerList_GetViewEntry(n);
                        DrawQ_Fill(menu_x, menu_y + y, 640, 16, n == slist_cursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
-                       M_PrintColored(0, y, serverlist_viewlist[n]->line1);y += 8;
-                       M_PrintColored(0, y, serverlist_viewlist[n]->line2);y += 8;
+                       M_PrintColored(0, y, entry->line1);y += 8;
+                       M_PrintColored(0, y, entry->line2);y += 8;
                }
        }
        else if (realtime - masterquerytime > 10)
@@ -4456,7 +4440,7 @@ static void M_ServerList_Key(int k, int ascii)
        case K_ENTER:
                S_LocalSound ("sound/misc/menu2.wav");
                if (serverlist_viewcount)
-                       Cbuf_AddText(va("connect \"%s\"\n", serverlist_viewlist[slist_cursor]->info.cname));
+                       Cbuf_AddText(va("connect \"%s\"\n", ServerList_GetViewEntry(slist_cursor)->info.cname));
                break;
 
        default:
@@ -4693,7 +4677,7 @@ static void M_ModList_Key(int k, int ascii)
 
 static void M_KeyEvent(int key, int ascii, qboolean downevent);
 static void M_Draw(void);
-void M_ToggleMenu_f(void);
+void M_ToggleMenu(int mode);
 static void M_Shutdown(void);
 
 void M_Init (void)
@@ -5141,11 +5125,12 @@ void MP_Draw (void)
        R_SelectScene( RST_CLIENT );
 }
 
-void MP_ToggleMenu_f (void)
+void MP_ToggleMenu(int mode)
 {
        PRVM_Begin;
        PRVM_SetProg(PRVM_MENUPROG);
 
+       prog->globals.generic[OFS_PARM0] = (float) mode;
        PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required");
 
        PRVM_End;
@@ -5211,7 +5196,7 @@ void MP_Restart(void)
 
 void (*MR_KeyEvent) (int key, int ascii, qboolean downevent);
 void (*MR_Draw) (void);
-void (*MR_ToggleMenu_f) (void);
+void (*MR_ToggleMenu) (int mode);
 void (*MR_Shutdown) (void);
 
 void MR_SetRouting(qboolean forceold)
@@ -5224,7 +5209,7 @@ void MR_SetRouting(qboolean forceold)
                // set menu router function pointers
                MR_KeyEvent = M_KeyEvent;
                MR_Draw = M_Draw;
-               MR_ToggleMenu_f = M_ToggleMenu_f;
+               MR_ToggleMenu = M_ToggleMenu;
                MR_Shutdown = M_Shutdown;
 
                // init
@@ -5241,7 +5226,7 @@ void MR_SetRouting(qboolean forceold)
                // set menu router function pointers
                MR_KeyEvent = MP_KeyEvent;
                MR_Draw = MP_Draw;
-               MR_ToggleMenu_f = MP_ToggleMenu_f;
+               MR_ToggleMenu = MP_ToggleMenu;
                MR_Shutdown = MP_Shutdown;
 
                if(!mp_init)
@@ -5262,9 +5247,11 @@ void MR_Restart(void)
 
 void Call_MR_ToggleMenu_f(void)
 {
+       int m;
+       m = ((Cmd_Argc() < 2) ? -1 : atoi(Cmd_Argv(1)));
        Host_StartVideo();
-       if(MR_ToggleMenu_f)
-               MR_ToggleMenu_f();
+       if(MR_ToggleMenu)
+               MR_ToggleMenu(m);
 }
 
 void MR_Init_Commands(void)