/*
================
-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;
}
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++)
{
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]));
{
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;
#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;
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)
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]);
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)
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;
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)
// 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
// 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)
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)