char temp[2];
temp[0] = num;
temp[1] = 0;
- DrawQ_String_Font(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, temp, 1, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
}
static void M_PrintColored(float cx, float cy, const char *str)
{
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, false, FONT_MENU);
}
static void M_Print(float cx, float cy, const char *str)
{
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
}
static void M_PrintRed(float cx, float cy, const char *str)
{
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 0, 0, 1, 0, NULL, true, FONT_MENU);
}
static void M_ItemPrint(float cx, float cy, const char *str, int unghosted)
{
if (unghosted)
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_MENU);
else
- DrawQ_String_Font(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
+ DrawQ_String(menu_x + cx, menu_y + cy, str, 0, 8, 8, 0.4, 0.4, 0.4, 1, 0, NULL, true, FONT_MENU);
}
static void M_DrawPic(float cx, float cy, const char *picname)
/*
================
-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]));
{
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)
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:
static int modlist_cursor;
//static int modlist_viewcount;
-#define MODLIST_TOTALSIZE 256
static int modlist_count = 0;
static modlist_entry_t modlist[MODLIST_TOTALSIZE];
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)