static qboolean m_entersound; ///< play after drawing a frame, so caching won't disrupt the sound
-void M_Update_Return_Reason(char *s)
+void M_Update_Return_Reason(const char *s)
{
strlcpy(m_return_reason, s, sizeof(m_return_reason));
if (s)
- Con_Printf("%s\n", s);
+ Con_DPrintf("%s\n", s);
}
#define StartingGame (m_multiplayer_cursor == 1)
#define NumberOfNehahraDemos 34
typedef struct nehahrademonames_s
{
- char *name;
- char *desc;
+ const char *name;
+ const char *desc;
} nehahrademonames_t;
static nehahrademonames_t NehahraDemos[NumberOfNehahraDemos] =
static void M_Background(int width, int height)
{
- menu_width = bound(1, width, vid_conwidth.integer);
- menu_height = bound(1, height, vid_conheight.integer);
+ menu_width = bound(1.0f, (float)width, vid_conwidth.value);
+ menu_height = bound(1.0f, (float)height, vid_conheight.value);
menu_x = (vid_conwidth.integer - menu_width) * 0.5;
menu_y = (vid_conheight.integer - menu_height) * 0.5;
//DrawQ_Fill(menu_x, menu_y, menu_width, menu_height, 0, 0, 0, 0.5, 0);
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]));
{
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;
typedef struct ratetable_s
{
int rate;
- char *name;
+ const char *name;
}
ratetable_t;
//=============================================================================
/* KEYS MENU */
-static char *quakebindnames[][2] =
+static const char *quakebindnames[][2] =
{
{"+attack", "attack"},
{"impulse 10", "next weapon"},
{"+movedown", "swim down"}
};
-static char *transfusionbindnames[][2] =
+static const char *transfusionbindnames[][2] =
{
{"", "Movement"}, // Movement commands
{"+forward", "walk forward"},
{"impulse 79", "taunt 9"}
};
-static char *goodvsbad2bindnames[][2] =
+static const char *goodvsbad2bindnames[][2] =
{
{"impulse 69", "Power 1"},
{"impulse 70", "Power 2"},
};
static int numcommands;
-static char *(*bindnames)[2];
+static const char *(*bindnames)[2];
/*
typedef struct binditem_s
#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)
+static void M_UnbindCommand (const char *command)
{
int j;
- char *b;
+ const char *b;
for (j = 0; j < (int)sizeof (keybindings[0]) / (int)sizeof (keybindings[0][0]); 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]);
// Current and Proposed Resolution
M_Print(16, video_cursor_table[t] - 12, " Current Resolution");
if (vid_supportrefreshrate && vid.userefreshrate && vid.fullscreen)
- M_Print(220, video_cursor_table[t] - 12, va("%dx%d %dhz", vid.width, vid.height, vid.refreshrate));
+ M_Print(220, video_cursor_table[t] - 12, va("%dx%d %.2fhz", vid.width, vid.height, vid.refreshrate));
else
M_Print(220, video_cursor_table[t] - 12, va("%dx%d", vid.width, vid.height));
M_Print(16, video_cursor_table[t], " New Resolution");
// Refresh Rate
M_ItemPrint(16, video_cursor_table[t], " Refresh Rate", vid_supportrefreshrate && vid_userefreshrate.integer);
- M_DrawSlider(220, video_cursor_table[t], vid_refreshrate.integer, 60, 150);
+ M_DrawSlider(220, video_cursor_table[t], vid_refreshrate.value, 50, 150);
t++;
// Fullscreen
t++;
// Vertical Sync
- M_ItemPrint(16, video_cursor_table[t], " Vertical Sync", gl_videosyncavailable);
+ M_ItemPrint(16, video_cursor_table[t], " Vertical Sync", true);
M_DrawCheckbox(220, video_cursor_table[t], vid_vsync.integer);
t++;
- M_ItemPrint(16, video_cursor_table[t], " Anisotropic Filter", gl_support_anisotropy);
- M_DrawSlider(220, video_cursor_table[t], gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
+ M_ItemPrint(16, video_cursor_table[t], " Anisotropic Filter", vid.support.ext_texture_filter_anisotropic);
+ M_DrawSlider(220, video_cursor_table[t], gl_texture_anisotropy.integer, 1, vid.max_anisotropy);
t++;
M_ItemPrint(16, video_cursor_table[t], " Texture Quality", true);
M_DrawSlider(220, video_cursor_table[t], gl_picmip.value, 3, 0);
t++;
- M_ItemPrint(16, video_cursor_table[t], " Texture Compression", gl_support_texture_compression);
+ M_ItemPrint(16, video_cursor_table[t], " Texture Compression", vid.support.arb_texture_compression);
M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer);
t++;
else if (video_cursor == t++)
Cvar_SetValueQuick (&vid_userefreshrate, !vid_userefreshrate.integer);
else if (video_cursor == t++)
- Cvar_SetValueQuick (&vid_refreshrate, bound(60, vid_refreshrate.integer + dir, 150));
+ Cvar_SetValueQuick (&vid_refreshrate, bound(50, vid_refreshrate.value + dir, 150));
else if (video_cursor == t++)
Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
else if (video_cursor == t++)
Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
else if (video_cursor == t++)
- Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), gl_max_anisotropy));
+ Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), vid.max_anisotropy));
else if (video_cursor == t++)
Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
else if (video_cursor == t++)
//=============================================================================
/* QUIT MENU */
-static char *m_quit_message[9];
+static const char *m_quit_message[9];
static int m_quit_prevstate;
static qboolean wasInMenus;
-static int M_QuitMessage(char *line1, char *line2, char *line3, char *line4, char *line5, char *line6, char *line7, char *line8)
+static int M_QuitMessage(const char *line1, const char *line2, const char *line3, const char *line4, const char *line5, const char *line6, const char *line7, const char *line8)
{
m_quit_message[0] = line1;
m_quit_message[1] = line2;
{
cachepic_t *p;
int basex;
- char *startJoin;
- char *protocol;
+ const char *startJoin;
+ const char *protocol;
M_Background(320, 200);
typedef struct level_s
{
- char *name;
- char *description;
+ const char *name;
+ const char *description;
} level_t;
typedef struct episode_s
{
- char *description;
+ const char *description;
int firstLevel;
int levels;
} episode_t;
typedef struct gamelevels_s
{
- char *gamename;
+ const char *gamename;
level_t *levels;
episode_t *episodes;
int numepisodes;
M_Print(0, 72, " Teamplay");
if (gamemode == GAME_ROGUE)
{
- char *msg;
+ const char *msg;
switch((int)teamplay.integer)
{
}
else
{
- char *msg;
+ const char *msg;
switch (teamplay.integer)
{
{
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)
//============================================================================
// Menu prog handling
-static char *m_required_func[] = {
+static const char *m_required_func[] = {
"m_init",
"m_keydown",
"m_draw",
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)
projects / xonotic / darkplaces.git / blobdiff