Officially support 1280x960 (4x) as a resolution.

2019-09-28 19:03:30 -07:00
parent 6855fb028d
commit 563ffa6ed1
3 changed files with 21 additions and 6 deletions
@@ -189,7 +189,7 @@ number_res_options (void)
 {
 	if (TFB_SupportsHardwareScaling ())
 	{
-		return 4;
+		return 5;
 	}
 	else
 	{
@@ -1185,6 +1185,16 @@ GetGlobalOptions (GLOBALOPTS *opts)
 			opts->res = OPTVAL_1024_768;
 		}		
 		break;
+	case 1280:
+		if (ScreenHeightActual != 960)
+		{
+			opts->res = OPTVAL_CUSTOM;
+		}
+		else
+		{
+			opts->res = OPTVAL_1280_960;
+		}
+		break;
 	default:
 		opts->res = OPTVAL_CUSTOM;
 		break;
@@ -1250,6 +1260,11 @@ SetGlobalOptions (GLOBALOPTS *opts)
 		NewHeight = 768;
 		NewDriver = TFB_GFXDRIVER_SDL_OPENGL;
 		break;
+	case OPTVAL_1280_960:
+		NewWidth = 1280;
+		NewHeight = 960;
+		NewDriver = TFB_GFXDRIVER_SDL_OPENGL;
+		break;
 	default:
 		/* Don't mess with the custom value */
 		break;
@@ -45,6 +45,7 @@ typedef enum {
 	OPTVAL_640_480,
 	OPTVAL_800_600,
 	OPTVAL_1024_768,
+	OPTVAL_1280_960,
 	OPTVAL_CUSTOM
 } OPT_RESTYPE;