X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=menu.c;h=7417844b5d67a72792e3837e14c9fd45db3c7917;hb=a854130c17f1490cf5fb25650994c12d8c9ad0a7;hp=1ab12b6ac22b3d2ff9346f6ea37cb20f971db66c;hpb=f98136b12bc52a2d9115248df5409403d373d294;p=xonotic%2Fdarkplaces.git diff --git a/menu.c b/menu.c index 1ab12b6a..7417844b 100644 --- a/menu.c +++ b/menu.c @@ -82,30 +82,30 @@ static void M_ServerList_Draw (void); static void M_ModList_Draw (void); -static void M_Main_Key (int key, char ascii); - static void M_SinglePlayer_Key (int key, char ascii); - static void M_Transfusion_Episode_Key (int key, char ascii); - static void M_Transfusion_Skill_Key (int key, char ascii); - static void M_Load_Key (int key, char ascii); - static void M_Save_Key (int key, char ascii); - static void M_MultiPlayer_Key (int key, char ascii); - static void M_Setup_Key (int key, char ascii); - static void M_Options_Key (int key, char ascii); - static void M_Options_Effects_Key (int key, char ascii); - static void M_Options_Graphics_Key (int key, char ascii); - static void M_Options_ColorControl_Key (int key, char ascii); - static void M_Keys_Key (int key, char ascii); - static void M_Reset_Key (int key, char ascii); - static void M_Video_Key (int key, char ascii); - static void M_Help_Key (int key, char ascii); - static void M_Credits_Key (int key, char ascii); - static void M_Quit_Key (int key, char ascii); -static void M_LanConfig_Key (int key, char ascii); -static void M_GameOptions_Key (int key, char ascii); -static void M_ServerList_Key (int key, char ascii); -static void M_ModList_Key (int key, char ascii); - -static qboolean m_entersound; // play after drawing a frame, so caching won't disrupt the sound +static void M_Main_Key (int key, int ascii); + static void M_SinglePlayer_Key (int key, int ascii); + static void M_Transfusion_Episode_Key (int key, int ascii); + static void M_Transfusion_Skill_Key (int key, int ascii); + static void M_Load_Key (int key, int ascii); + static void M_Save_Key (int key, int ascii); + static void M_MultiPlayer_Key (int key, int ascii); + static void M_Setup_Key (int key, int ascii); + static void M_Options_Key (int key, int ascii); + static void M_Options_Effects_Key (int key, int ascii); + static void M_Options_Graphics_Key (int key, int ascii); + static void M_Options_ColorControl_Key (int key, int ascii); + static void M_Keys_Key (int key, int ascii); + static void M_Reset_Key (int key, int ascii); + static void M_Video_Key (int key, int ascii); + static void M_Help_Key (int key, int ascii); + static void M_Credits_Key (int key, int ascii); + static void M_Quit_Key (int key, int ascii); +static void M_LanConfig_Key (int key, int ascii); +static void M_GameOptions_Key (int key, int ascii); +static void M_ServerList_Key (int key, int ascii); +static void M_ModList_Key (int key, int ascii); + +static qboolean m_entersound; ///< play after drawing a frame, so caching won't disrupt the sound void M_Update_Return_Reason(char *s) { @@ -215,7 +215,7 @@ static void M_ItemPrint(float cx, float cy, const char *str, int unghosted) static void M_DrawPic(float cx, float cy, const char *picname) { - DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic(picname, true), 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic(menu_x + cx, menu_y + cy, Draw_CachePic (picname), 0, 0, 1, 1, 1, 1, 0); } static void M_DrawTextBox(float x, float y, float width, float height) @@ -277,7 +277,7 @@ void M_ToggleMenu_f (void) { m_entersound = true; - if (key_dest != key_menu || m_state != m_main) + if ((key_dest != key_menu && key_dest != key_menu_grabbed) || m_state != m_main) { if(Cmd_Argc() == 2 && !strcmp(Cmd_Argv(1), "1")) return; @@ -316,7 +316,7 @@ void M_Menu_Demos_f (void) } -static void M_Demo_Key (int k, char ascii) +static void M_Demo_Key (int k, int ascii) { switch (k) { @@ -383,7 +383,7 @@ void M_Menu_Main_f (void) MAIN_ITEMS = 5; // check if the game data is missing and use a different main menu if so - m_missingdata = !forceqmenu.integer && Draw_CachePic (s, true)->tex == r_texture_notexture; + m_missingdata = !forceqmenu.integer && Draw_CachePic (s)->tex == r_texture_notexture; if (m_missingdata) MAIN_ITEMS = 2; @@ -425,7 +425,7 @@ static void M_Main_Draw (void) if (gamemode == GAME_TRANSFUSION) { int y1, y2, y3; M_Background(640, 480); - p = Draw_CachePic ("gfx/menu/tb-transfusion", true); + p = Draw_CachePic ("gfx/menu/tb-transfusion"); M_DrawPic (640/2 - p->width/2, 40, "gfx/menu/tb-transfusion"); y2 = 120; // 8 rather than MAIN_ITEMS to skip a number and not miss the last option @@ -446,7 +446,7 @@ static void M_Main_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/ttl_main", true); + p = Draw_CachePic ("gfx/ttl_main"); M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_main"); // Nehahra if (gamemode == GAME_NEHAHRA) @@ -467,7 +467,7 @@ static void M_Main_Draw (void) } -static void M_Main_Key (int key, char ascii) +static void M_Main_Key (int key, int ascii) { switch (key) { @@ -720,7 +720,7 @@ static void M_SinglePlayer_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/ttl_sgl", true); + p = Draw_CachePic ("gfx/ttl_sgl"); // Some mods don't have a single player mode if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) @@ -748,7 +748,7 @@ static void M_SinglePlayer_Draw (void) } -static void M_SinglePlayer_Key (int key, char ascii) +static void M_SinglePlayer_Key (int key, int ascii) { if (gamemode == GAME_GOODVSBAD2 || gamemode == GAME_BATTLEMECH) { @@ -810,7 +810,7 @@ static void M_SinglePlayer_Key (int key, char ascii) //============================================================================= /* LOAD/SAVE MENU */ -static int load_cursor; // 0 < load_cursor < MAX_SAVEGAMES +static int load_cursor; ///< 0 < load_cursor < MAX_SAVEGAMES #define MAX_SAVEGAMES 12 static char m_filenames[MAX_SAVEGAMES][SAVEGAME_COMMENT_LENGTH+1]; @@ -829,8 +829,8 @@ static void M_ScanSaves (void) { strlcpy (m_filenames[i], "--- UNUSED SLOT ---", sizeof(m_filenames[i])); loadable[i] = false; - sprintf (name, "s%i.sav", (int)i); - f = FS_Open (name, "rb", false, false); + dpsnprintf (name, sizeof(name), "s%i.sav", (int)i); + f = FS_OpenRealFile (name, "rb", false); if (!f) continue; // read enough to get the comment @@ -884,7 +884,7 @@ static void M_Load_Draw (void) M_Background(320, 200); - p = Draw_CachePic ("gfx/p_load", true); + p = Draw_CachePic ("gfx/p_load"); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_load" ); for (i=0 ; i< MAX_SAVEGAMES; i++) @@ -902,7 +902,7 @@ static void M_Save_Draw (void) M_Background(320, 200); - p = Draw_CachePic ("gfx/p_save", true); + p = Draw_CachePic ("gfx/p_save"); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_save"); for (i=0 ; iwidth/2, 40, "gfx/menu/tb-episodes"); for (y = 0; y < EPISODE_ITEMS; y++){ M_DrawPic (0, 160 + y * 40, va("gfx/menu/episode%i", y+1)); @@ -1017,7 +1017,7 @@ static void M_Transfusion_Episode_Draw (void) M_DrawPic (0, 120 + (m_episode_cursor + 1) * 40, va("gfx/menu/episode%iselected", m_episode_cursor + 1)); } -static void M_Transfusion_Episode_Key (int key, char ascii) +static void M_Transfusion_Episode_Key (int key, int ascii) { switch (key) { @@ -1065,7 +1065,7 @@ static void M_Transfusion_Skill_Draw (void) cachepic_t *p; M_Background(640, 480); - p = Draw_CachePic ("gfx/menu/tb-difficulty", true); + p = Draw_CachePic ("gfx/menu/tb-difficulty"); M_DrawPic(640/2 - p->width/2, 40, "gfx/menu/tb-difficulty"); for (y = 0; y < SKILL_ITEMS; y++) @@ -1075,7 +1075,7 @@ static void M_Transfusion_Skill_Draw (void) M_DrawPic (0, 140 + (m_skill_cursor + 1) *40, va("gfx/menu/difficulty%iselected", m_skill_cursor + 1)); } -static void M_Transfusion_Skill_Key (int key, char ascii) +static void M_Transfusion_Skill_Key (int key, int ascii) { switch (key) { @@ -1169,7 +1169,7 @@ static void M_MultiPlayer_Draw (void) if (gamemode == GAME_TRANSFUSION) { M_Background(640, 480); - p = Draw_CachePic ("gfx/menu/tb-online", true); + p = Draw_CachePic ("gfx/menu/tb-online"); M_DrawPic (640/2 - p->width/2, 140, "gfx/menu/tb-online"); for (f = 1; f <= MULTIPLAYER_ITEMS; f++) M_DrawPic (0, 180 + f*40, va("gfx/menu/online%i", f)); @@ -1179,7 +1179,7 @@ static void M_MultiPlayer_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/p_multi", true); + p = Draw_CachePic ("gfx/p_multi"); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); M_DrawPic (72, 32, "gfx/mp_menu"); @@ -1189,7 +1189,7 @@ static void M_MultiPlayer_Draw (void) } -static void M_MultiPlayer_Key (int key, char ascii) +static void M_MultiPlayer_Key (int key, int ascii) { switch (key) { @@ -1297,7 +1297,7 @@ static void M_Setup_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/p_multi", true); + p = Draw_CachePic ("gfx/p_multi"); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); M_Print(64, 40, "Your name"); @@ -1382,7 +1382,7 @@ static void M_Setup_Draw (void) } -static void M_Setup_Key (int k, char ascii) +static void M_Setup_Key (int k, int ascii) { int l; @@ -1508,9 +1508,9 @@ static void M_DrawSlider (int x, int y, float num, float rangemin, float rangema M_DrawCharacter (x+i*8, y, 130); M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131); if (fabs((int)num - num) < 0.01) - sprintf(text, "%i", (int)num); + dpsnprintf(text, sizeof(text), "%i", (int)num); else - sprintf(text, "%.3f", num); + dpsnprintf(text, sizeof(text), "%.3f", num); M_Print(x + (SLIDER_RANGE+2) * 8, y, text); } @@ -1553,7 +1553,7 @@ static void M_Menu_Options_AdjustSliders (int dir) else if (options_cursor == optnum++) ; else if (options_cursor == optnum++) ; else if (options_cursor == optnum++) ; - else if (options_cursor == optnum++) Cvar_SetValueQuick(&crosshair, bound(0, crosshair.integer + dir, 6)); + else if (options_cursor == optnum++) Cvar_SetValueQuick(&crosshair, bound(0, crosshair.integer + dir, 7)); else if (options_cursor == optnum++) Cvar_SetValueQuick(&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50)); else if (options_cursor == optnum++) Cvar_SetValueQuick(&m_pitch, -m_pitch.value); else if (options_cursor == optnum++) Cvar_SetValueQuick(&scr_fov, bound(1, scr_fov.integer + dir * 1, 170)); @@ -1630,7 +1630,7 @@ static void M_Options_Draw (void) M_Background(320, bound(200, 32 + OPTIONS_ITEMS * 8, vid_conheight.integer)); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/p_option", true); + p = Draw_CachePic ("gfx/p_option"); M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optnum = 0; @@ -1642,7 +1642,7 @@ static void M_Options_Draw (void) M_Options_PrintCommand( " Go to console", true); M_Options_PrintCommand( " Reset to defaults", true); M_Options_PrintCommand( " Change Video Mode", true); - M_Options_PrintSlider( " Crosshair", true, crosshair.value, 0, 5); + M_Options_PrintSlider( " Crosshair", true, crosshair.value, 0, 7); M_Options_PrintSlider( " Mouse Speed", true, sensitivity.value, 1, 50); M_Options_PrintCheckbox(" Invert Mouse", true, m_pitch.value < 0); M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170); @@ -1668,7 +1668,7 @@ static void M_Options_Draw (void) } -static void M_Options_Key (int k, char ascii) +static void M_Options_Key (int k, int ascii) { switch (k) { @@ -1837,7 +1837,7 @@ static void M_Options_Effects_Draw (void) M_Background(320, bound(200, 32 + OPTIONS_EFFECTS_ITEMS * 8, vid_conheight.integer)); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/p_option", true); + p = Draw_CachePic ("gfx/p_option"); M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_effects_cursor; @@ -1883,7 +1883,7 @@ static void M_Options_Effects_Draw (void) } -static void M_Options_Effects_Key (int k, char ascii) +static void M_Options_Effects_Key (int k, int ascii) { switch (k) { @@ -1988,7 +1988,7 @@ static void M_Options_Graphics_Draw (void) M_Background(320, bound(200, 32 + OPTIONS_GRAPHICS_ITEMS * 8, vid_conheight.integer)); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/p_option", true); + p = Draw_CachePic ("gfx/p_option"); M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_graphics_cursor; @@ -2019,7 +2019,7 @@ static void M_Options_Graphics_Draw (void) } -static void M_Options_Graphics_Key (int k, char ascii) +static void M_Options_Graphics_Key (int k, int ascii) { switch (k) { @@ -2176,12 +2176,12 @@ static void M_Options_ColorControl_Draw (void) float x, c, s, t, u, v; cachepic_t *p, *dither; - dither = Draw_CachePic("gfx/colorcontrol/ditherpattern", true); + dither = Draw_CachePic_Flags ("gfx/colorcontrol/ditherpattern", CACHEPICFLAG_NOCLAMP); M_Background(320, 256); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/p_option", true); + p = Draw_CachePic ("gfx/p_option"); M_DrawPic((320-p->width)/2, 4, "gfx/p_option"); optcursor = options_colorcontrol_cursor; @@ -2246,7 +2246,7 @@ static void M_Options_ColorControl_Draw (void) } -static void M_Options_ColorControl_Key (int k, char ascii) +static void M_Options_ColorControl_Key (int k, int ascii) { switch (k) { @@ -2511,7 +2511,7 @@ static int bind_grab; void M_Menu_Keys_f (void) { - key_dest = key_menu; + key_dest = key_menu_grabbed; m_state = m_keys; m_entersound = true; } @@ -2569,7 +2569,7 @@ static void M_Keys_Draw (void) M_Background(320, 48 + 8 * numcommands); - p = Draw_CachePic ("gfx/ttl_cstm", true); + p = Draw_CachePic ("gfx/ttl_cstm"); M_DrawPic ( (320-p->width)/2, 4, "gfx/ttl_cstm"); if (bind_grab) @@ -2620,7 +2620,7 @@ static void M_Keys_Draw (void) } -static void M_Keys_Key (int k, char ascii) +static void M_Keys_Key (int k, int ascii) { char cmd[80]; int keys[NUMKEYS]; @@ -2634,7 +2634,7 @@ static void M_Keys_Key (int k, char ascii) } else //if (k != '`') { - sprintf (cmd, "bind \"%s\" \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor][0]); + dpsnprintf (cmd, sizeof(cmd), "bind \"%s\" \"%s\"\n", Key_KeynumToString (k), bindnames[keys_cursor][0]); Cbuf_InsertText (cmd); } @@ -2696,7 +2696,7 @@ void M_Menu_Reset_f (void) } -static void M_Reset_Key (int key, char ascii) +static void M_Reset_Key (int key, int ascii) { switch (key) { @@ -2777,6 +2777,7 @@ video_resolution_t video_resolutions[] = {"WideScreen 16x9" , 683, 384, 683, 384, 1 }, {"WideScreen 16x9" , 960, 540, 640, 360, 1 }, {"WideScreen 16x9" , 1280, 720, 640, 360, 1 }, +{"WideScreen 16x9" , 1360, 768, 680, 384, 1 }, {"WideScreen 16x9" , 1366, 768, 683, 384, 1 }, {"WideScreen 16x9" , 1920,1080, 640, 360, 1 }, {"WideScreen 16x9" , 2560,1440, 640, 360, 1 }, @@ -2793,9 +2794,9 @@ video_resolution_t video_resolutions[] = #define VID_DEFAULT 3 #define VID_RES_COUNT ((int)(sizeof(video_resolutions) / sizeof(video_resolutions[0])) - 1) -#define VIDEO_ITEMS 10 +#define VIDEO_ITEMS 11 static int video_cursor = 0; -static int video_cursor_table[] = {56, 68, 88, 100, 112, 132, 162, 170, 178, 186}; +static int video_cursor_table[VIDEO_ITEMS] = {68, 88, 96, 104, 112, 120, 128, 136, 144, 152, 168}; static int video_resolution; void M_Menu_Video_f (void) @@ -2842,53 +2843,73 @@ void M_Menu_Video_f (void) static void M_Video_Draw (void) { + int t; cachepic_t *p; M_Background(320, 200); M_DrawPic(16, 4, "gfx/qplaque"); - p = Draw_CachePic("gfx/vidmodes", true); + p = Draw_CachePic ("gfx/vidmodes"); M_DrawPic((320-p->width)/2, 4, "gfx/vidmodes"); - // Current Resolution - M_Print(16, video_cursor_table[0], " Current Resolution"); - if (vid_supportrefreshrate && vid.fullscreen) - M_Print(220, video_cursor_table[0], va("%dx%d %dhz", vid.width, vid.height, vid.refreshrate)); + t = 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)); else - M_Print(220, video_cursor_table[0], va("%dx%d", vid.width, vid.height)); + M_Print(220, video_cursor_table[t] - 12, va("%dx%d", vid.width, vid.height)); + M_Print(16, video_cursor_table[t], " New Resolution"); + M_Print(220, video_cursor_table[t], va("%dx%d", video_resolutions[video_resolution].width, video_resolutions[video_resolution].height)); + M_Print(96, video_cursor_table[t] + 8, va("Type: %s", video_resolutions[video_resolution].type)); + t++; - // Proposed Resolution - M_Print(16, video_cursor_table[1], " New Resolution"); - M_Print(220, video_cursor_table[1], va("%dx%d", video_resolutions[video_resolution].width, video_resolutions[video_resolution].height)); - M_Print(96, video_cursor_table[1] + 8, va("Type: %s", video_resolutions[video_resolution].type)); + // Bits per pixel + M_Print(16, video_cursor_table[t], " Bits per pixel"); + M_Print(220, video_cursor_table[t], (vid_bitsperpixel.integer == 32) ? "32" : "16"); + t++; // Bits per pixel - M_Print(16, video_cursor_table[2], " Bits per pixel"); - M_Print(220, video_cursor_table[2], (vid_bitsperpixel.integer == 32) ? "32" : "16"); + M_Print(16, video_cursor_table[t], " Antialiasing"); + M_DrawSlider(220, video_cursor_table[t], vid_samples.value, 1, 32); + t++; // Refresh Rate - M_ItemPrint(16, video_cursor_table[3], " Refresh Rate", vid_supportrefreshrate); - M_DrawSlider(220, video_cursor_table[3], vid_refreshrate.integer, 60, 150); + M_ItemPrint(16, video_cursor_table[t], " Use Refresh Rate", vid_supportrefreshrate); + M_DrawCheckbox(220, video_cursor_table[t], vid_userefreshrate.integer); + t++; - // Fullscreen - M_Print(16, video_cursor_table[4], " Fullscreen"); - M_DrawCheckbox(220, video_cursor_table[4], vid_fullscreen.integer); + // 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); + t++; - // "Apply" button - M_Print(220, video_cursor_table[5], "Apply"); + // Fullscreen + M_Print(16, video_cursor_table[t], " Fullscreen"); + M_DrawCheckbox(220, video_cursor_table[t], vid_fullscreen.integer); + t++; // Vertical Sync - M_ItemPrint(16, video_cursor_table[6], " Vertical Sync", gl_videosyncavailable); - M_DrawCheckbox(220, video_cursor_table[6], vid_vsync.integer); + M_ItemPrint(16, video_cursor_table[t], " Vertical Sync", gl_videosyncavailable); + M_DrawCheckbox(220, video_cursor_table[t], vid_vsync.integer); + t++; - M_ItemPrint(16, video_cursor_table[7], " Anisotropic Filter", gl_support_anisotropy); - M_DrawSlider(220, video_cursor_table[7], gl_texture_anisotropy.integer, 1, gl_max_anisotropy); + 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); + t++; - M_ItemPrint(16, video_cursor_table[8], " Texture Quality", true); - M_DrawSlider(220, video_cursor_table[8], gl_picmip.value, 3, 0); + 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[9], " Texture Compression", gl_support_texture_compression); - M_DrawCheckbox(220, video_cursor_table[9], gl_texturecompression.integer); + M_ItemPrint(16, video_cursor_table[t], " Texture Compression", gl_support_texture_compression); + M_DrawCheckbox(220, video_cursor_table[t], gl_texturecompression.integer); + t++; + + // "Apply" button + M_Print(220, video_cursor_table[t], "Apply"); + t++; // Cursor M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1)); @@ -2897,56 +2918,48 @@ static void M_Video_Draw (void) static void M_Menu_Video_AdjustSliders (int dir) { + int t; + S_LocalSound ("sound/misc/menu3.wav"); - switch (video_cursor) + t = 0; + if (video_cursor == t++) { // Resolution - case 1: + int r; + for(r = 0;r < VID_RES_COUNT;r++) { - int r; - for(r = 0;r < VID_RES_COUNT;r++) - { - video_resolution += dir; - if (video_resolution >= VID_RES_COUNT) - video_resolution = 0; - if (video_resolution < 0) - video_resolution = VID_RES_COUNT - 1; - if (video_resolutions[video_resolution].width >= vid_minwidth.integer && video_resolutions[video_resolution].height >= vid_minheight.integer) - break; - } - break; + video_resolution += dir; + if (video_resolution >= VID_RES_COUNT) + video_resolution = 0; + if (video_resolution < 0) + video_resolution = VID_RES_COUNT - 1; + if (video_resolutions[video_resolution].width >= vid_minwidth.integer && video_resolutions[video_resolution].height >= vid_minheight.integer) + break; } - - // Bits per pixel - case 2: - Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32); - break; - // Refresh Rate - case 3: - Cvar_SetValueQuick (&vid_refreshrate, vid_refreshrate.integer + dir); - break; - case 4: - Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer); - break; - - case 6: - Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer); - break; - case 7: - Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), gl_max_anisotropy)); - break; - case 8: - Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3)); - break; - case 9: - Cvar_SetValueQuick (&gl_texturecompression, !gl_texturecompression.integer); - break; } + else if (video_cursor == t++) + Cvar_SetValueQuick (&vid_bitsperpixel, (vid_bitsperpixel.integer == 32) ? 16 : 32); + else if (video_cursor == t++) + Cvar_SetValueQuick (&vid_samples, bound(1, vid_samples.value * (dir > 0 ? 2 : 0.5), 32)); + 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)); + 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)); + else if (video_cursor == t++) + Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3)); + else if (video_cursor == t++) + Cvar_SetValueQuick (&gl_texturecompression, !gl_texturecompression.integer); } -static void M_Video_Key (int key, char ascii) +static void M_Video_Key (int key, int ascii) { switch (key) { @@ -2954,8 +2967,10 @@ static void M_Video_Key (int key, char ascii) // vid_shared.c has a copy of the current video config. We restore it Cvar_SetValueQuick(&vid_fullscreen, vid.fullscreen); Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel); + Cvar_SetValueQuick(&vid_samples, vid.samples); if (vid_supportrefreshrate) Cvar_SetValueQuick(&vid_refreshrate, vid.refreshrate); + Cvar_SetValueQuick(&vid_userefreshrate, vid.userefreshrate); S_LocalSound ("sound/misc/menu1.wav"); M_Menu_Options_f (); @@ -2965,7 +2980,7 @@ static void M_Video_Key (int key, char ascii) m_entersound = true; switch (video_cursor) { - case 5: + case (VIDEO_ITEMS - 1): Cvar_SetValueQuick (&vid_width, video_resolutions[video_resolution].width); Cvar_SetValueQuick (&vid_height, video_resolutions[video_resolution].height); Cvar_SetValueQuick (&vid_conwidth, video_resolutions[video_resolution].conwidth); @@ -3027,7 +3042,7 @@ static void M_Help_Draw (void) } -static void M_Help_Key (int key, char ascii) +static void M_Help_Key (int key, int ascii) { switch (key) { @@ -3074,7 +3089,7 @@ static void M_Credits_Draw (void) } -static void M_Credits_Key (int key, char ascii) +static void M_Credits_Key (int key, int ascii) { M_Menu_Main_f (); } @@ -3162,14 +3177,14 @@ static int M_ChooseQuitMessage(int request) break; } return 0; -}; +} void M_Menu_Quit_f (void) { int n; if (m_state == m_quit) return; - wasInMenus = (key_dest == key_menu); + wasInMenus = (key_dest == key_menu || key_dest == key_menu_grabbed); key_dest = key_menu; m_quit_prevstate = m_state; m_state = m_quit; @@ -3181,7 +3196,7 @@ void M_Menu_Quit_f (void) } -static void M_Quit_Key (int key, char ascii) +static void M_Quit_Key (int key, int ascii) { switch (key) { @@ -3242,7 +3257,7 @@ static int lanConfig_cursor_table [] = {56, 76, 84, 120}; static int lanConfig_port; static char lanConfig_portname[6]; -static char lanConfig_joinname[22]; +static char lanConfig_joinname[40]; void M_Menu_LanConfig_f (void) { @@ -3257,7 +3272,7 @@ void M_Menu_LanConfig_f (void) if (StartingGame) lanConfig_cursor = 1; lanConfig_port = 26000; - sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port); + dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port); M_Update_Return_Reason(""); } @@ -3273,7 +3288,7 @@ static void M_LanConfig_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/p_multi", true); + p = Draw_CachePic ("gfx/p_multi"); basex = (320-p->width)/2; M_DrawPic (basex, 4, "gfx/p_multi"); @@ -3286,7 +3301,7 @@ static void M_LanConfig_Draw (void) basex += 8; M_Print(basex, lanConfig_cursor_table[0], "Port"); - M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, 6, 1); + M_DrawTextBox (basex+8*8, lanConfig_cursor_table[0]-8, sizeof(lanConfig_portname), 1); M_Print(basex+9*8, lanConfig_cursor_table[0], lanConfig_portname); if (JoiningGame) @@ -3294,7 +3309,7 @@ static void M_LanConfig_Draw (void) M_Print(basex, lanConfig_cursor_table[1], "Search for DarkPlaces games..."); M_Print(basex, lanConfig_cursor_table[2], "Search for QuakeWorld games..."); M_Print(basex, lanConfig_cursor_table[3]-16, "Join game at:"); - M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, 22, 1); + M_DrawTextBox (basex+8, lanConfig_cursor_table[3]-8, sizeof(lanConfig_joinname), 1); M_Print(basex+16, lanConfig_cursor_table[3], lanConfig_joinname); } else @@ -3316,7 +3331,7 @@ static void M_LanConfig_Draw (void) } -static void M_LanConfig_Key (int key, char ascii) +static void M_LanConfig_Key (int key, int ascii) { int l; @@ -3392,7 +3407,7 @@ static void M_LanConfig_Key (int key, char ascii) if (lanConfig_cursor == 3) { l = (int)strlen(lanConfig_joinname); - if (l < 21) + if (l < (int)sizeof(lanConfig_joinname) - 1) { lanConfig_joinname[l+1] = 0; lanConfig_joinname[l] = ascii; @@ -3404,7 +3419,7 @@ static void M_LanConfig_Key (int key, char ascii) if (lanConfig_cursor == 0) { l = (int)strlen(lanConfig_portname); - if (l < 5) + if (l < (int)sizeof(lanConfig_portname) - 1) { lanConfig_portname[l+1] = 0; lanConfig_portname[l] = ascii; @@ -3423,7 +3438,7 @@ static void M_LanConfig_Key (int key, char ascii) l = atoi(lanConfig_portname); if (l <= 65535) lanConfig_port = l; - sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port); + dpsnprintf(lanConfig_portname, sizeof(lanConfig_portname), "%u", (unsigned int) lanConfig_port); } //============================================================================= @@ -3906,7 +3921,7 @@ void M_GameOptions_Draw (void) M_Background(320, 200); M_DrawPic (16, 4, "gfx/qplaque"); - p = Draw_CachePic ("gfx/p_multi", true); + p = Draw_CachePic ("gfx/p_multi"); M_DrawPic ( (320-p->width)/2, 4, "gfx/p_multi"); M_DrawTextBox (152, 32, 10, 1); @@ -4224,7 +4239,7 @@ static void M_NetStart_Change (int dir) } } -static void M_GameOptions_Key (int key, char ascii) +static void M_GameOptions_Key (int key, int ascii) { gamelevels_t *g; int l; @@ -4352,7 +4367,7 @@ static void M_ServerList_Draw (void) start = bound(0, slist_cursor - (visible >> 1), serverlist_viewcount - visible); end = min(start + visible, serverlist_viewcount); - p = Draw_CachePic("gfx/p_multi", true); + p = Draw_CachePic ("gfx/p_multi"); M_DrawPic((640 - p->width) / 2, 4, "gfx/p_multi"); if (end > start) { @@ -4380,7 +4395,7 @@ static void M_ServerList_Draw (void) } -static void M_ServerList_Key(int k, char ascii) +static void M_ServerList_Key(int k, int ascii) { switch (k) { @@ -4454,10 +4469,7 @@ void ModList_RebuildList(void) stringlist_t list; stringlistinit(&list); - if (fs_basedir[0]) - listdirectory(&list, fs_basedir); - else - listdirectory(&list, "./"); + listdirectory(&list, fs_basedir, ""); stringlistsort(&list); modlist_count = 0; modlist_numenabled = fs_numgamedirs; @@ -4585,7 +4597,7 @@ static void M_ModList_Draw (void) start = bound(0, modlist_cursor - (visible >> 1), modlist_count - visible); end = min(start + visible, modlist_count); - p = Draw_CachePic("gfx/p_option", true); + p = Draw_CachePic ("gfx/p_option"); M_DrawPic((640 - p->width) / 2, 4, "gfx/p_option"); if (end > start) { @@ -4603,7 +4615,7 @@ static void M_ModList_Draw (void) } } -static void M_ModList_Key(int k, char ascii) +static void M_ModList_Key(int k, int ascii) { switch (k) { @@ -4653,7 +4665,7 @@ static void M_ModList_Key(int k, char ascii) //============================================================================= /* Menu Subsystem */ -static void M_KeyEvent(int key, char ascii, qboolean downevent); +static void M_KeyEvent(int key, int ascii, qboolean downevent); static void M_Draw(void); void M_ToggleMenu_f(void); static void M_Shutdown(void); @@ -4744,7 +4756,7 @@ void M_Init (void) void M_Draw (void) { - if (key_dest != key_menu) + if (key_dest != key_menu && key_dest != key_menu_grabbed) m_state = m_none; if (m_state == m_none) @@ -4857,10 +4869,10 @@ void M_Draw (void) g = (int)(realtime * 64)%96; scale_y_rate = (float)(g+1) / 96; top_offset = (g+12)/12; - p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset), true); - drop1 = Draw_CachePic("gfx/menu/blooddrop1", true); - drop2 = Draw_CachePic("gfx/menu/blooddrop2", true); - drop3 = Draw_CachePic("gfx/menu/blooddrop3", true); + p = Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset)); + drop1 = Draw_CachePic ("gfx/menu/blooddrop1"); + drop2 = Draw_CachePic ("gfx/menu/blooddrop2"); + drop3 = Draw_CachePic ("gfx/menu/blooddrop3"); 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, drop3, 0, 0, 1, 1, 1, 1, 0); @@ -4875,7 +4887,7 @@ void M_Draw (void) DrawQ_Pic (scale_x + 557, scale_y_repeat * .9425 + scale_y + scale_y_rate * scale_y_repeat, drop1, 0, 0, 1, 1, 1, 1, 0); DrawQ_Pic (scale_x + 606, scale_y_repeat * .5 + scale_y + scale_y_rate * scale_y_repeat, drop2, 0, 0, 1, 1, 1, 1, 0); } - DrawQ_Pic (scale_x, -1, Draw_CachePic(va("gfx/menu/blooddrip%i", top_offset), true), 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (scale_x, -1, Draw_CachePic (va("gfx/menu/blooddrip%i", top_offset)), 0, 0, 1, 1, 1, 1, 0); } } } @@ -4890,7 +4902,7 @@ void M_Draw (void) } -void M_KeyEvent (int key, char ascii, qboolean downevent) +void M_KeyEvent (int key, int ascii, qboolean downevent) { if (!downevent) return; @@ -5015,10 +5027,6 @@ static char *m_required_func[] = { "m_shutdown", }; -#ifdef NG_MENU -static qboolean m_displayed; -#endif - static int m_numrequiredfunc = sizeof(m_required_func) / sizeof(char*); void MR_SetRouting (qboolean forceold); @@ -5053,10 +5061,13 @@ void MP_Error(const char *format, ...) // init the normal menu now -> this will also correct the menu router pointers MR_SetRouting (TRUE); + // reset the active scene, too (to be on the safe side ;)) + R_SelectScene( RST_CLIENT ); + Host_AbortCurrentFrame(); } -void MP_KeyEvent (int key, char ascii, qboolean downevent) +void MP_KeyEvent (int key, int ascii, qboolean downevent) { PRVM_Begin; PRVM_SetProg(PRVM_MENUPROG); @@ -5074,12 +5085,34 @@ void MP_KeyEvent (int key, char ascii, qboolean downevent) void MP_Draw (void) { + // declarations that are needed right now + + float oldquality; + + R_SelectScene( RST_MENU ); + + // reset the temp entities each frame + r_refdef.scene.numtempentities = 0; + + // menu scenes do not use reduced rendering quality + oldquality = r_refdef.view.quality; + r_refdef.view.quality = 1; + // TODO: this needs to be exposed to R_SetView (or something similar) ASAP [2/5/2008 Andreas] + r_refdef.scene.time = realtime; + PRVM_Begin; PRVM_SetProg(PRVM_MENUPROG); + // FIXME: this really shouldnt error out lest we have a very broken refdef state...? + // or does it kill the server too? PRVM_ExecuteProgram(prog->funcoffsets.m_draw,"m_draw() required"); PRVM_End; + + // TODO: imo this should be moved into scene, too [1/27/2008 Andreas] + r_refdef.view.quality = oldquality; + + R_SelectScene( RST_CLIENT ); } void MP_ToggleMenu_f (void) @@ -5087,15 +5120,7 @@ void MP_ToggleMenu_f (void) PRVM_Begin; PRVM_SetProg(PRVM_MENUPROG); -#ifdef NG_MENU - m_displayed = !m_displayed; - if( m_displayed ) - PRVM_ExecuteProgram(prog->funcoffsets.m_display,"m_display() required"); - else - PRVM_ExecuteProgram(prog->funcoffsets.m_hide,"m_hide() required"); -#else PRVM_ExecuteProgram(prog->funcoffsets.m_toggle,"m_toggle() required"); -#endif PRVM_End; } @@ -5116,16 +5141,6 @@ 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; @@ -5151,9 +5166,7 @@ void MP_Init (void) // note: OP_STATE is not supported by menu qc, we don't even try to detect // it here -#ifdef NG_MENU - m_displayed = false; -#endif + in_client_mouse = true; // call the prog init PRVM_ExecuteProgram(prog->funcoffsets.m_init,"m_init() required"); @@ -5169,7 +5182,7 @@ void MP_Restart(void) //============================================================================ // Menu router -void (*MR_KeyEvent) (int key, char ascii, qboolean downevent); +void (*MR_KeyEvent) (int key, int ascii, qboolean downevent); void (*MR_Draw) (void); void (*MR_ToggleMenu_f) (void); void (*MR_Shutdown) (void); @@ -5232,7 +5245,7 @@ void MR_Init_Commands(void) // set router console commands Cvar_RegisterVariable (&forceqmenu); Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue); - Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat"); + Cmd_AddCommand ("menu_restart",MR_Restart, "restart menu system (reloads menu.dat)"); Cmd_AddCommand ("togglemenu", Call_MR_ToggleMenu_f, "opens or closes menu"); }