{
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;
#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] = {56, 68, 88, 100, 108, 116, 136, 166, 174, 182, 190};
static int video_resolution;
void M_Menu_Video_f (void)
// Current Resolution
M_Print(16, video_cursor_table[0], " Current Resolution");
- if (vid_supportrefreshrate && vid.fullscreen)
+ if (vid_supportrefreshrate && vid.userefreshrate && vid.fullscreen)
M_Print(220, video_cursor_table[0], 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[2], (vid_bitsperpixel.integer == 32) ? "32" : "16");
// 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[3], " Use Refresh Rate", vid_supportrefreshrate);
+ M_DrawCheckbox(220, video_cursor_table[3], vid_userefreshrate.integer);
+
+ // Refresh Rate
+ M_ItemPrint(16, video_cursor_table[4], " Refresh Rate", vid_supportrefreshrate && vid_userefreshrate.integer);
+ M_DrawSlider(220, video_cursor_table[4], vid_refreshrate.integer, 60, 150);
// Fullscreen
- M_Print(16, video_cursor_table[4], " Fullscreen");
- M_DrawCheckbox(220, video_cursor_table[4], vid_fullscreen.integer);
+ M_Print(16, video_cursor_table[5], " Fullscreen");
+ M_DrawCheckbox(220, video_cursor_table[5], vid_fullscreen.integer);
// "Apply" button
- M_Print(220, video_cursor_table[5], "Apply");
+ M_Print(220, video_cursor_table[6], "Apply");
// 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[7], " Vertical Sync", gl_videosyncavailable);
+ M_DrawCheckbox(220, video_cursor_table[7], vid_vsync.integer);
- 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[8], " Anisotropic Filter", gl_support_anisotropy);
+ M_DrawSlider(220, video_cursor_table[8], gl_texture_anisotropy.integer, 1, gl_max_anisotropy);
- 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[9], " Texture Quality", true);
+ M_DrawSlider(220, video_cursor_table[9], gl_picmip.value, 3, 0);
- 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[10], " Texture Compression", gl_support_texture_compression);
+ M_DrawCheckbox(220, video_cursor_table[10], gl_texturecompression.integer);
// Cursor
M_DrawCharacter(200, video_cursor_table[video_cursor], 12+((int)(realtime*4)&1));
break;
// Refresh Rate
case 3:
- Cvar_SetValueQuick (&vid_refreshrate, vid_refreshrate.integer + dir);
+ Cvar_SetValueQuick (&vid_userefreshrate, !vid_userefreshrate.integer);
break;
case 4:
+ Cvar_SetValueQuick (&vid_refreshrate, bound(60, vid_refreshrate.integer + dir, 150));
+ break;
+ case 5:
Cvar_SetValueQuick (&vid_fullscreen, !vid_fullscreen.integer);
break;
- case 6:
+ case 7:
Cvar_SetValueQuick (&vid_vsync, !vid_vsync.integer);
break;
- case 7:
+ case 8:
Cvar_SetValueQuick (&gl_texture_anisotropy, bound(1, gl_texture_anisotropy.value * (dir < 0 ? 0.5 : 2.0), gl_max_anisotropy));
break;
- case 8:
+ case 9:
Cvar_SetValueQuick (&gl_picmip, bound(0, gl_picmip.value - dir, 3));
break;
- case 9:
+ case 10:
Cvar_SetValueQuick (&gl_texturecompression, !gl_texturecompression.integer);
break;
}
Cvar_SetValueQuick(&vid_bitsperpixel, vid.bitsperpixel);
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 ();
m_entersound = true;
switch (video_cursor)
{
- case 5:
+ case 6:
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);
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;
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)
// 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_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;
+
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)
projects / xonotic / darkplaces.git / blobdiff