void M_Background(int width, int height)
{
- menu_width = bound(1, width, vid.conwidth);
- menu_height = bound(1, height, vid.conheight);
- menu_x = (vid.conwidth - menu_width) * 0.5;
- menu_y = (vid.conheight - menu_height) * 0.5;
+ menu_width = bound(1, width, vid_conwidth.integer);
+ menu_height = bound(1, height, vid_conheight.integer);
+ 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);
- DrawQ_Fill(0, 0, vid.conwidth, vid.conheight, 0, 0, 0, 0.5, 0);
+ DrawQ_Fill(0, 0, vid_conwidth.integer, vid_conheight.integer, 0, 0, 0, 0.5, 0);
}
/*
void M_ScanSaves (void)
{
- int i, j, len;
+ size_t i, j, len;
char name[MAX_OSPATH];
char buf[SAVEGAME_COMMENT_LENGTH + 256];
const char *t;
{
strcpy (m_filenames[i], "--- UNUSED SLOT ---");
loadable[i] = false;
- sprintf (name, "s%i.sav", i);
+ sprintf (name, "s%i.sav", (int)i);
f = FS_Open (name, "rb", false, false);
if (!f)
continue;
break;
if (setup_cursor == 0)
{
- l = strlen(setup_myname);
+ l = (int)strlen(setup_myname);
if (l < 15)
{
setup_myname[l+1] = 0;
{
DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
M_ItemPrint(0, opty, s, enabled);
- M_DrawCheckbox(0 + strlen(s) * 8 + 8, opty, yes);
+ M_DrawCheckbox(0 + (int)strlen(s) * 8 + 8, opty, yes);
}
opty += 8;
optnum++;
{
DrawQ_Fill(menu_x, menu_y + opty, 320, 8, optnum == optcursor ? (0.5 + 0.2 * sin(realtime * M_PI)) : 0, 0, 0, 0.5, 0);
M_ItemPrint(0, opty, s, enabled);
- M_DrawSlider(0 + strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
+ M_DrawSlider(0 + (int)strlen(s) * 8 + 8, opty, value, minvalue, maxvalue);
}
opty += 8;
optnum++;
int visible;
cachepic_t *p;
- M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid.conheight));
+ M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic("gfx/p_option.lmp", false);
int visible;
cachepic_t *p;
- M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid.conheight));
+ M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic("gfx/p_option.lmp", false);
}
-#define OPTIONS_GRAPHICS_ITEMS 12
+#define OPTIONS_GRAPHICS_ITEMS 14
int options_graphics_cursor;
extern cvar_t r_bloom_power;
extern cvar_t r_bloom_blur;
extern cvar_t r_bloom_resolution;
+extern cvar_t gl_picmip;
void M_Menu_Options_Graphics_AdjustSliders (int dir)
{
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_power, bound(1, r_bloom_power.value + dir * 1, 16));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_blur, bound(1, r_bloom_blur.value + dir * 1, 16));
else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&r_bloom_resolution, bound(64, r_bloom_resolution.value + dir * 64, 2048));
+ else if (options_graphics_cursor == optnum++) Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
+ else if (options_graphics_cursor == optnum++) Cbuf_AddText ("r_restart\n");
}
int visible;
cachepic_t *p;
- M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid.conheight));
+ M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer));
M_DrawPic(16, 4, "gfx/qplaque.lmp");
p = Draw_CachePic("gfx/p_option.lmp", false);
M_Options_PrintSlider( " Bloom Power", true, r_bloom_power.value, 1, 16);
M_Options_PrintSlider( " Bloom Blur", true, r_bloom_blur.value, 1, 16);
M_Options_PrintSlider( " Bloom Resolution", true, r_bloom_resolution.value, 64, 2048);
+ M_Options_PrintSlider( " Texture Quality", true, gl_picmip.value, 3, 0);
+ M_Options_PrintCommand( " Restart Renderer", true);
}
opty += 4;
DrawQ_Fill(menu_x, menu_y + opty, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);opty += 4;
- s = (float) 312 / 2 * vid.realwidth / vid.conwidth;
- t = (float) 4 / 2 * vid.realheight / vid.conheight;
+ s = (float) 312 / 2 * vid.width / vid_conwidth.integer;
+ t = (float) 4 / 2 * vid.height / vid_conheight.integer;
DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);opty += 4;
DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,0,0,1, 0,1, 0,0,0,1, 1,1, 1,0,0,1, 0);opty += 4;
DrawQ_SuperPic(menu_x + 4, menu_y + opty, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);opty += 4;
DrawQ_SuperPic(menu_x + 4, menu_y + opty, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,1,1,1, 0,1, 0,0,0,1, 1,1, 1,1,1,1, 0);opty += 4;
c = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake
- s = (float) 48 / 2 * vid.realwidth / vid.conwidth;
- t = (float) 48 / 2 * vid.realheight / vid.conheight;
+ s = (float) 48 / 2 * vid.width / vid_conwidth.integer;
+ t = (float) 48 / 2 * vid.height / vid_conheight.integer;
u = s * 0.5;
v = t * 0.5;
opty += 8;
#define NUMKEYS 5
-void M_FindKeysForCommand (char *command, int *keys)
+void M_FindKeysForCommand (const char *command, int *keys)
{
int count;
int j;
#define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1)
int video_resolution;
-extern int current_vid_fullscreen;
-extern int current_vid_width;
-extern int current_vid_height;
-extern int current_vid_bitsperpixel;
-
void M_Menu_Video_f (void)
{
// Look for the current resolution
for (video_resolution = 0; video_resolution < VID_RES_COUNT; video_resolution++)
{
- if (video_resolutions[video_resolution][0] == current_vid_width &&
- video_resolutions[video_resolution][1] == current_vid_height)
+ if (video_resolutions[video_resolution][0] == vid.width &&
+ video_resolutions[video_resolution][1] == vid.height)
break;
}
{
case K_ESCAPE:
// vid_shared.c has a copy of the current video config. We restore it
- Cvar_SetValueQuick(&vid_fullscreen, current_vid_fullscreen);
- Cvar_SetValueQuick(&vid_width, current_vid_width);
- Cvar_SetValueQuick(&vid_height, current_vid_height);
- Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
+ Cvar_SetValueQuick(&vid_fullscreen, vid.fullscreen);
+ Cvar_SetValueQuick(&vid_width, vid.width);
+ Cvar_SetValueQuick(&vid_height, vid.height);
+ Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel);
S_LocalSound ("sound/misc/menu1.wav");
M_Menu_Options_f ();
int i, l, linelength, firstline, lastline, lines;
for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_quit_message[i];i++)
{
- if ((l = strlen(m_quit_message[i])))
+ if ((l = (int)strlen(m_quit_message[i])))
{
if (firstline > i)
firstline = i;
if (lanConfig_cursor == 2)
{
- l = strlen(lanConfig_joinname);
+ l = (int)strlen(lanConfig_joinname);
if (l < 21)
{
lanConfig_joinname[l+1] = 0;
break;
if (lanConfig_cursor == 0)
{
- l = strlen(lanConfig_portname);
+ l = (int)strlen(lanConfig_portname);
if (l < 5)
{
lanConfig_portname[l+1] = 0;
case K_BACKSPACE:
if (gameoptions_cursor == 9)
{
- l = strlen(hostname.string);
+ l = (int)strlen(hostname.string);
if (l)
{
l = min(l - 1, 37);
break;
if (gameoptions_cursor == 9)
{
- l = strlen(hostname.string);
+ l = (int)strlen(hostname.string);
if (l < 37)
{
memcpy(hostnamebuf, hostname.string, l);
// use as much vertical space as available
if (gamemode == GAME_TRANSFUSION)
- M_Background(640, vid.conheight - 80);
+ M_Background(640, vid_conheight.integer - 80);
else
- M_Background(640, vid.conheight);
+ M_Background(640, vid_conheight.integer);
// scroll the list as the cursor moves
s = va("%i/%i masters %i/%i servers", masterreplycount, masterquerycount, serverreplycount, serverquerycount);
M_PrintRed((640 - strlen(s) * 8) / 2, 32, s);
cachepic_t *p;
int g, scale_x, scale_y, scale_y_repeat, top_offset;
float scale_y_rate;
- scale_y_repeat = vid.conheight * 2;
+ scale_y_repeat = vid_conheight.integer * 2;
g = (int)(realtime * 64)%96;
scale_y_rate = (float)(g+1) / 96;
top_offset = (g+12)/12;
p = Draw_CachePic (va("gfx/blooddrip%i", top_offset), false);
- for (scale_x = 0; scale_x <= vid.conwidth; scale_x += p->width) {
- for (scale_y = -scale_y_repeat; scale_y <= vid.conheight; scale_y += scale_y_repeat) {
+ for (scale_x = 0; scale_x <= vid_conwidth.integer; scale_x += p->width) {
+ for (scale_y = -scale_y_repeat; scale_y <= vid_conheight.integer; scale_y += scale_y_repeat) {
DrawQ_Pic (scale_x + 21, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
DrawQ_Pic (scale_x + 116, scale_y_repeat + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop1", 0, 0, 1, 1, 1, 1, 0);
DrawQ_Pic (scale_x + 180, scale_y_repeat * .275 + scale_y + scale_y_rate * scale_y_repeat, "gfx/blooddrop3", 0, 0, 1, 1, 1, 1, 0);
void MR_SetRouting (qboolean forceold);
-void MP_Error(void)
+void MP_Error(const char *format, ...)
{
+ char errorstring[4096];
+ va_list argptr;
+
+ va_start (argptr, format);
+ dpvsnprintf (errorstring, sizeof(errorstring), format, argptr);
+ va_end (argptr);
+ Con_Printf( "Menu_Error: %s\n", errorstring );
+
+ PRVM_Crash();
+
// fall back to the normal menu
// say it
key_dest = key_game;
- //PRVM_ResetProg();
-
// init the normal menu now -> this will also correct the menu router pointers
MR_SetRouting (TRUE);
+
+ Host_AbortCurrentFrame();
}
void MP_Keydown (int key, char ascii)
*prog->time = realtime;
// pass key
- prog->globals[OFS_PARM0] = (float) key;
- prog->globals[OFS_PARM1] = (float) ascii;
+ prog->globals.generic[OFS_PARM0] = (float) key;
+ prog->globals.generic[OFS_PARM1] = (float) ascii;
PRVM_ExecuteProgram(m_keydown, M_F_KEYDOWN"(float key, float ascii) required\n");
PRVM_End;
PRVM_End;
}
+void MP_Fallback (void)
+{
+ MP_Shutdown();
+
+ key_dest = key_game;
+
+ // init the normal menu now -> this will also correct the menu router pointers
+ MR_SetRouting (TRUE);
+}
+
void MP_Init (void)
{
PRVM_Begin;
PRVM_InitProg(PRVM_MENUPROG);
- prog->crc = M_PROGHEADER_CRC;
+ prog->headercrc = M_PROGHEADER_CRC;
prog->edictprivate_size = 0; // no private struct used
prog->name = M_NAME;
+ prog->num_edicts = 1;
prog->limit_edicts = M_MAX_EDICTS;
prog->extensionstring = vm_m_extensions;
prog->builtins = vm_m_builtins;
// allocate the mempools
prog->progs_mempool = Mem_AllocPool(M_PROG_FILENAME, 0, NULL);
- PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func);
+ PRVM_LoadProgs(M_PROG_FILENAME, m_numrequiredfunc, m_required_func, 0, NULL);
// set m_draw and m_keydown
m_draw = (func_t) (PRVM_ED_FindFunction(M_F_DRAW) - prog->functions);
Cvar_RegisterVariable (&forceqmenu);
Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
if (gamemode == GAME_NETHERWORLD)
- Cmd_AddCommand ("menu_fallback", MP_Error); //Force to old-style menu
+ Cmd_AddCommand ("menu_fallback", MP_Fallback); //Force to old-style menu
Cmd_AddCommand ("menu_restart",MR_Restart);
Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f);
}