fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-10 09:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

gl_vidsdl.c: some video menu code readability tweaking

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@839 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Sander van Dijk 2013-03-03 13:43:11 +00:00
parent 56ee142fc0
commit bd5b2ae556
1 changed files with 71 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
Quake/gl_vidsdl.c
View file

@ -1071,8 +1071,16 @@ void VID_SyncCvars (void)
// //
//========================================================================== //==========================================================================
#define VIDEO_OPTIONS_ITEMS 6 enum {
static int video_cursor_table[] = {48, 56, 64, 72, 88, 96}; VID_OPT_MODE,
VID_OPT_BPP,
VID_OPT_FULLSCREEN,
VID_OPT_VSYNC,
VID_OPT_TEST,
VID_OPT_APPLY,
VIDEO_OPTIONS_ITEMS
};
static int video_options_cursor = 0; static int video_options_cursor = 0;
typedef struct { typedef struct {
@ -1279,16 +1287,16 @@ static void VID_MenuKey (int key)
S_LocalSound ("misc/menu3.wav"); S_LocalSound ("misc/menu3.wav");
switch (video_options_cursor) switch (video_options_cursor)
{ {
case 0: case VID_OPT_MODE:
VID_Menu_ChooseNextMode (1); VID_Menu_ChooseNextMode (1);
break; break;
case 1: case VID_OPT_BPP:
VID_Menu_ChooseNextBpp (1); VID_Menu_ChooseNextBpp (1);
break; break;
case 2: case VID_OPT_FULLSCREEN:
Cbuf_AddText ("toggle vid_fullscreen\n"); Cbuf_AddText ("toggle vid_fullscreen\n");
break; break;
case 3: case VID_OPT_VSYNC:
Cbuf_AddText ("toggle vid_vsync\n"); // kristian Cbuf_AddText ("toggle vid_vsync\n"); // kristian
break; break;
default: default:
@ -1300,16 +1308,16 @@ static void VID_MenuKey (int key)
S_LocalSound ("misc/menu3.wav"); S_LocalSound ("misc/menu3.wav");
switch (video_options_cursor) switch (video_options_cursor)
{ {
case 0: case VID_OPT_MODE:
VID_Menu_ChooseNextMode (-1); VID_Menu_ChooseNextMode (-1);
break; break;
case 1: case VID_OPT_BPP:
VID_Menu_ChooseNextBpp (-1); VID_Menu_ChooseNextBpp (-1);
break; break;
case 2: case VID_OPT_FULLSCREEN:
Cbuf_AddText ("toggle vid_fullscreen\n"); Cbuf_AddText ("toggle vid_fullscreen\n");
break; break;
case 3: case VID_OPT_VSYNC:
Cbuf_AddText ("toggle vid_vsync\n"); Cbuf_AddText ("toggle vid_vsync\n");
break; break;
default: default:
@ -1321,22 +1329,22 @@ static void VID_MenuKey (int key)
m_entersound = true; m_entersound = true;
switch (video_options_cursor) switch (video_options_cursor)
{ {
case 0: case VID_OPT_MODE:
VID_Menu_ChooseNextMode (1); VID_Menu_ChooseNextMode (1);
break; break;
case 1: case VID_OPT_BPP:
VID_Menu_ChooseNextBpp (1); VID_Menu_ChooseNextBpp (1);
break; break;
case 2: case VID_OPT_FULLSCREEN:
Cbuf_AddText ("toggle vid_fullscreen\n"); Cbuf_AddText ("toggle vid_fullscreen\n");
break; break;
case 3: case VID_OPT_VSYNC:
Cbuf_AddText ("toggle vid_vsync\n"); Cbuf_AddText ("toggle vid_vsync\n");
break; break;
case 4: case VID_OPT_TEST:
Cbuf_AddText ("vid_test\n"); Cbuf_AddText ("vid_test\n");
break; break;
case 5: case VID_OPT_APPLY:
Cbuf_AddText ("vid_restart\n"); Cbuf_AddText ("vid_restart\n");
key_dest = key_game; key_dest = key_game;
m_state = m_none; m_state = m_none;
@ -1359,54 +1367,66 @@ VID_MenuDraw
*/ */
static void VID_MenuDraw (void) static void VID_MenuDraw (void)
{ {
int i = 0; int i, y;
qpic_t *p; qpic_t *p;
const char *title; const char *title;
M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp")); y = 4;
// plaque
p = Draw_CachePic ("gfx/qplaque.lmp");
M_DrawTransPic (16, y, p);
//p = Draw_CachePic ("gfx/vidmodes.lmp"); //p = Draw_CachePic ("gfx/vidmodes.lmp");
p = Draw_CachePic ("gfx/p_option.lmp"); p = Draw_CachePic ("gfx/p_option.lmp");
M_DrawPic ( (320-p->width)/2, 4, p); M_DrawPic ( (320-p->width)/2, y, p);
y += 28;
// title // title
title = "Video Options"; title = "Video Options";
M_PrintWhite ((320-8*strlen(title))/2, 32, title); M_PrintWhite ((320-8*strlen(title))/2, y, title);
y += 16;
// options // options
M_Print (16, video_cursor_table[i], " Video mode"); for (i = 0; i < VIDEO_OPTIONS_ITEMS; i++)
M_Print (184, video_cursor_table[i], va("%ix%i", (int)vid_width.value, (int)vid_height.value)); {
i++; switch (i)
{
case VID_OPT_MODE:
M_Print (16, y, " Video mode");
M_Print (184, y, va("%ix%i", (int)vid_width.value, (int)vid_height.value));
break;
case VID_OPT_BPP:
M_Print (16, y, " Color depth");
M_Print (184, y, va("%i", (int)vid_bpp.value));
break;
case VID_OPT_FULLSCREEN:
M_Print (16, y, " Fullscreen");
M_DrawCheckbox (184, y, (int)vid_fullscreen.value);
break;
case VID_OPT_VSYNC:
M_Print (16, y, " Vertical sync");
if (gl_swap_control)
M_DrawCheckbox (184, y, (int)vid_vsync.value);
else
M_Print (184, y, "N/A");
break;
case VID_OPT_TEST:
y += 8; //separate the test and apply items
M_Print (16, y, " Test changes");
break;
case VID_OPT_APPLY:
M_Print (16, y, " Apply changes");
break;
}
M_Print (16, video_cursor_table[i], " Color depth"); if (video_options_cursor == i)
M_Print (184, video_cursor_table[i], va("%i", (int)vid_bpp.value)); M_DrawCharacter (168, y, 12+((int)(realtime*4)&1));
i++;
M_Print (16, video_cursor_table[i], " Fullscreen"); y += 8;
M_DrawCheckbox (184, video_cursor_table[i], (int)vid_fullscreen.value); }
i++;
// added vsync to the video menu -- kristian
M_Print (16, video_cursor_table[i], " Vertical Sync");
if (gl_swap_control)
M_DrawCheckbox (184, video_cursor_table[i], (int)vid_vsync.value);
else
M_Print (184, video_cursor_table[i], "N/A");
i++;
M_Print (16, video_cursor_table[i], " Test changes");
i++;
M_Print (16, video_cursor_table[i], " Apply changes");
// cursor
M_DrawCharacter (168, video_cursor_table[video_options_cursor], 12+((int)(realtime*4)&1));
// notes "345678901234567890123456789012345678"
// M_Print (16, 172, "Windowed modes always use the desk- ");
// M_Print (16, 180, "top color depth, and can never be ");
// M_Print (16, 188, "larger than the desktop resolution. ");
} }
/* /*