Officially support 1280x960 (4x) as a resolution.
This commit is contained in:
@@ -40,27 +40,26 @@ UQM Remixes
|
|||||||
640x480
|
640x480
|
||||||
800x600
|
800x600
|
||||||
1024x768
|
1024x768
|
||||||
|
1280x960
|
||||||
Custom
|
Custom
|
||||||
|
|
||||||
#(CAT_0_OPT_0_DESC)
|
#(CAT_0_OPT_0_DESC)
|
||||||
320x240 resolution.
|
320x240 resolution.
|
||||||
Available with SDL framebuffer or OpenGL.
|
|
||||||
|
|
||||||
#(CAT_0_OPT_1_DESC)
|
#(CAT_0_OPT_1_DESC)
|
||||||
640x480 resolution.
|
640x480 resolution.
|
||||||
Available with SDL framebuffer or OpenGL.
|
|
||||||
|
|
||||||
#(CAT_0_OPT_2_DESC)
|
#(CAT_0_OPT_2_DESC)
|
||||||
800x600 resolution.
|
800x600 resolution.
|
||||||
Requires OpenGL graphics drivers.
|
|
||||||
|
|
||||||
#(CAT_0_OPT_3_DESC)
|
#(CAT_0_OPT_3_DESC)
|
||||||
1024x768 resolution.
|
1024x768 resolution.
|
||||||
Requires OpenGL graphics drivers.
|
|
||||||
|
|
||||||
#(CAT_0_OPT_4_DESC)
|
#(CAT_0_OPT_4_DESC)
|
||||||
|
1280x960 resolution.
|
||||||
|
|
||||||
|
#(CAT_0_OPT_5_DESC)
|
||||||
Custom resolution set from the commandline.
|
Custom resolution set from the commandline.
|
||||||
Requires OpenGL graphics drivers.
|
|
||||||
|
|
||||||
#(CAT_1_OPTS)
|
#(CAT_1_OPTS)
|
||||||
If Possible
|
If Possible
|
||||||
|
|||||||
+16
-1
@@ -189,7 +189,7 @@ number_res_options (void)
|
|||||||
{
|
{
|
||||||
if (TFB_SupportsHardwareScaling ())
|
if (TFB_SupportsHardwareScaling ())
|
||||||
{
|
{
|
||||||
return 4;
|
return 5;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1185,6 +1185,16 @@ GetGlobalOptions (GLOBALOPTS *opts)
|
|||||||
opts->res = OPTVAL_1024_768;
|
opts->res = OPTVAL_1024_768;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 1280:
|
||||||
|
if (ScreenHeightActual != 960)
|
||||||
|
{
|
||||||
|
opts->res = OPTVAL_CUSTOM;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
opts->res = OPTVAL_1280_960;
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
opts->res = OPTVAL_CUSTOM;
|
opts->res = OPTVAL_CUSTOM;
|
||||||
break;
|
break;
|
||||||
@@ -1250,6 +1260,11 @@ SetGlobalOptions (GLOBALOPTS *opts)
|
|||||||
NewHeight = 768;
|
NewHeight = 768;
|
||||||
NewDriver = TFB_GFXDRIVER_SDL_OPENGL;
|
NewDriver = TFB_GFXDRIVER_SDL_OPENGL;
|
||||||
break;
|
break;
|
||||||
|
case OPTVAL_1280_960:
|
||||||
|
NewWidth = 1280;
|
||||||
|
NewHeight = 960;
|
||||||
|
NewDriver = TFB_GFXDRIVER_SDL_OPENGL;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
/* Don't mess with the custom value */
|
/* Don't mess with the custom value */
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ typedef enum {
|
|||||||
OPTVAL_640_480,
|
OPTVAL_640_480,
|
||||||
OPTVAL_800_600,
|
OPTVAL_800_600,
|
||||||
OPTVAL_1024_768,
|
OPTVAL_1024_768,
|
||||||
|
OPTVAL_1280_960,
|
||||||
OPTVAL_CUSTOM
|
OPTVAL_CUSTOM
|
||||||
} OPT_RESTYPE;
|
} OPT_RESTYPE;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user