yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-21 11:21:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Die Modeliste einmal neu geordnet. Verlangt u.U. eine neue Config, aber

Browse source 
ist das mein Problem?!
This commit is contained in:
Yamagi Burmeister 2010-01-08 15:38:19 +00:00
parent 7f20626edb
commit 62a82f103d
2 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/posix/vid/menu.c
View file

@ -160,12 +160,10 @@ static void ApplyChanges( void *unused )
if (s_mode_list[OPENGL_MENU].curvalue != CUSTOM_MODE) if (s_mode_list[OPENGL_MENU].curvalue != CUSTOM_MODE)
{ {
printf("DEBUG: %i\n", s_mode_list[OPENGL_MENU].curvalue); printf("DEBUG: %i\n", s_mode_list[OPENGL_MENU].curvalue);
Cvar_SetValue( "sw_mode", s_mode_list[SOFTWARE_MENU].curvalue );
Cvar_SetValue( "gl_mode", s_mode_list[OPENGL_MENU].curvalue ); Cvar_SetValue( "gl_mode", s_mode_list[OPENGL_MENU].curvalue );
} }
else else
{ {
Cvar_SetValue( "sw_mode", -1 );
Cvar_SetValue( "gl_mode", -1 ); Cvar_SetValue( "gl_mode", -1 );
} }
@ -198,23 +196,23 @@ void VID_MenuInit( void )
"[320 240 ]", "[320 240 ]",
"[400 300 ]", "[400 300 ]",
"[512 384 ]", "[512 384 ]",
"[640 400 ]",
"[640 480 ]", "[640 480 ]",
"[800 500 ]",
"[800 600 ]", "[800 600 ]",
"[960 720 ]", "[960 720 ]",
"[1024 480 ]",
"[1024 640 ]",
"[1024 768 ]", "[1024 768 ]",
"[1152 768 ]",
"[1152 864 ]", "[1152 864 ]",
"[1280 800 ]",
"[1280 854 ]",
"[1280 1024]", "[1280 1024]",
"[1600 1200]", "[1600 1200]",
"[2048 1536]",
"[1024 480 ]", /* sony vaio pocketbook */
"[1152 768 ]", /* Apple TiBook */
"[1280 854 ]", /* apple TiBook */
"[640 400 ]", /* generic 16:10 widescreen resolutions */
"[800 500 ]", /* as found on many modern notebooks */
"[1024 640 ]",
"[1280 800 ]",
"[1680 1050]", "[1680 1050]",
"[1920 1200]", "[1920 1200]",
"[2048 1536]",
"[Custom ]", "[Custom ]",
0 0
}; };
@ -277,12 +275,10 @@ void VID_MenuInit( void )
/* custom mode */ /* custom mode */
if (gl_mode->value >= 1.0) if (gl_mode->value >= 1.0)
{ {
s_mode_list[SOFTWARE_MENU].curvalue = sw_mode->value;
s_mode_list[OPENGL_MENU].curvalue = gl_mode->value; s_mode_list[OPENGL_MENU].curvalue = gl_mode->value;
} }
else else
{ {
s_mode_list[SOFTWARE_MENU].curvalue = CUSTOM_MODE;
s_mode_list[OPENGL_MENU].curvalue = CUSTOM_MODE; s_mode_list[OPENGL_MENU].curvalue = CUSTOM_MODE;
} }

34
src/posix/vid/refresh.c
View file

@ -141,23 +141,23 @@ vidmode_t vid_modes[] =
{ "Mode 0: 320x240", 320, 240, 0 }, { "Mode 0: 320x240", 320, 240, 0 },
{ "Mode 1: 400x300", 400, 300, 1 }, { "Mode 1: 400x300", 400, 300, 1 },
{ "Mode 2: 512x384", 512, 384, 2 }, { "Mode 2: 512x384", 512, 384, 2 },
{ "Mode 3: 640x480", 640, 480, 3 }, { "Mode 3: 640x400", 640, 400, 3 },
{ "Mode 4: 800x600", 800, 600, 4 }, { "Mode 4: 640x480", 640, 480, 4 },
{ "Mode 5: 960x720", 960, 720, 5 }, { "Mode 5: 800x500", 800, 500, 5 },
{ "Mode 6: 1024x768", 1024, 768, 6 }, { "Mode 6: 800x600", 800, 600, 6 },
{ "Mode 7: 1152x864", 1152, 864, 7 }, { "Mode 7: 960x720", 960, 720, 7 },
{ "Mode 8: 1280x1024", 1280, 1024, 8 }, { "Mode 8: 1024x480", 1024, 480, 8 },
{ "Mode 9: 1600x1200", 1600, 1200, 9 }, { "Mode 9: 1024x640", 1024, 640, 9 },
{ "Mode 10: 2048x1536", 2048, 1536, 10 }, { "Mode 10: 1024x768", 1024, 768, 10 },
{ "Mode 11: 1024x480", 1024, 480, 11 }, /* Sony VAIO Pocketbook */ { "Mode 11: 1152x768", 1152, 768, 11 },
{ "Mode 12: 1152x768", 1152, 768, 12 }, /* Apple TiBook */ { "Mode 12: 1152x864", 1152, 864, 12 },
{ "Mode 13: 1280x854", 1280, 854, 13 }, /* Apple TiBook */ { "Mode 13: 1280x800", 1280, 800, 13 },
{ "Mode 14: 640x400", 640, 400, 14 }, /* generic 16:10 widescreen*/ { "Mode 14: 1280x854", 1280, 854, 14 },
{ "Mode 15: 800x500", 800, 500, 15 }, /* as found modern */ { "Mode 15: 1280x1024", 1280, 1024, 15 },
{ "Mode 16: 1024x640", 1024, 640, 16 }, /* notebooks */ { "Mode 16: 1600x1200", 1600, 1200, 16 },
{ "Mode 17: 1280x800", 1280, 800, 17 }, { "Mode 17: 1680x1050", 1680, 1050, 17 },
{ "Mode 18: 1680x1050", 1680, 1050, 18 }, { "Mode 18: 1920x1200", 1920, 1200, 18 },
{ "Mode 19: 1920x1200", 1920, 1200, 19 }, { "Mode 19: 2048x1536", 2048, 1536, 19 },
}; };
qboolean VID_GetModeInfo( int *width, int *height, int mode ) qboolean VID_GetModeInfo( int *width, int *height, int mode )