X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=f1a1355204e01962b00f9a909a42131de0f6271d;hb=3872243b86efe37ee0f5d91bb8acd5e03c280947;hp=99e4dff6c7ecf785d69fbed0154e9ce0a74ce198;hpb=a2f0f236c6d98b811f3483c39290f84907ba8752;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index 99e4dff6..f1a13552 100644 --- a/menu.c +++ b/menu.c @@ -163,12 +163,12 @@ float menu_x, menu_y, menu_width, menu_height; 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); } /* @@ -1645,7 +1645,7 @@ void M_Options_Draw (void) 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); @@ -1844,7 +1844,7 @@ void M_Options_Effects_Draw (void) 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); @@ -1932,7 +1932,7 @@ void M_Options_Effects_Key (int k, char ascii) } -#define OPTIONS_GRAPHICS_ITEMS 12 +#define OPTIONS_GRAPHICS_ITEMS 14 int options_graphics_cursor; @@ -1955,6 +1955,7 @@ extern cvar_t r_bloom_intensity; 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) { @@ -1975,6 +1976,8 @@ 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"); } @@ -1983,7 +1986,7 @@ void M_Options_Graphics_Draw (void) 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); @@ -2006,6 +2009,8 @@ void M_Options_Graphics_Draw (void) 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); } @@ -2198,8 +2203,8 @@ void M_Options_ColorControl_Draw (void) 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; @@ -2210,8 +2215,8 @@ void M_Options_ColorControl_Draw (void) 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; @@ -2506,7 +2511,7 @@ void M_Menu_Keys_f (void) #define NUMKEYS 5 -void M_FindKeysForCommand (char *command, int *keys) +void M_FindKeysForCommand (const char *command, int *keys) { int count; int j; @@ -2729,11 +2734,6 @@ unsigned short video_resolutions[][2] = {{320,240}, {400,300}, {512,384}, {640,4 #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) { @@ -2744,8 +2744,8 @@ 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; } @@ -2839,10 +2839,10 @@ void M_Video_Key (int key, char ascii) { 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 (); @@ -3582,10 +3582,10 @@ level_t transfusionlevels[] = {"fragm", "Frag'M"}, {"maim", "Maim"}, {"qe1m7", "The House of Chthon"}, - {"qdm1", "Dm-Place of Two Deaths"}, - {"qdm4", "Dm-The Bad Place"}, - {"qdm5", "Dm-The Cistern"}, - {"qmorbias", "Dm-Morbias"}, + {"qdm1", "Place of Two Deaths"}, + {"qdm4", "The Bad Place"}, + {"qdm5", "The Cistern"}, + {"qmorbias", "DM-Morbias"}, {"simple", "Dead Simple"} }; @@ -4167,9 +4167,9 @@ void M_ServerList_Draw (void) // 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); @@ -4439,13 +4439,13 @@ void M_Draw (void) 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); @@ -4610,8 +4610,18 @@ static func_t m_draw, m_keydown; 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 @@ -4619,10 +4629,10 @@ void MP_Error(void) 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) @@ -4634,8 +4644,8 @@ 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; @@ -4694,14 +4704,25 @@ void MP_Shutdown (void) 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; @@ -4713,7 +4734,7 @@ void MP_Init (void) // 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); @@ -4801,7 +4822,7 @@ void MR_Init_Commands(void) 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); }