- Added support for new resolution: 960x540

- Custom Resolution (25) can now set to any user specific resolution (X, Y) value, but must be at least 640x480 resolution

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-10-04 15:55:21 +00:00
parent 9930b4d557
commit 6c2273f4eb
2 changed files with 40 additions and 31 deletions
+14 -7
View File
@@ -1520,6 +1520,10 @@ void GetRuntimeSettings( )
iResX = 640;
iResY = 480;
break;
case _960x540:
iResX = 960;
iResY = 540;
break;
case _800x600:
iResX = 800;
iResY = 600;
@@ -1613,13 +1617,16 @@ void GetRuntimeSettings( )
iResY = 1600;
break;
case _CustomRes:
iResX = max( (int)oProps.getIntProperty(L"Ja2 Settings", L"CUSTOM_SCREEN_RESOLUTION_X", -1), 800 );
iResY = max( (int)oProps.getIntProperty(L"Ja2 Settings", L"CUSTOM_SCREEN_RESOLUTION_Y", -1), 600 );
if ( iResX < 1024 || iResY < 768 )
{
// Buggler: hack to use 800x600 interface
iResolution = _1280x720;
}
iResX = max( (int)oProps.getIntProperty(L"Ja2 Settings", L"CUSTOM_SCREEN_RESOLUTION_X", -1), 640 );
iResY = max( (int)oProps.getIntProperty(L"Ja2 Settings", L"CUSTOM_SCREEN_RESOLUTION_Y", -1), 480 );
if (iResX < 800 || iResY < 600)
iResolution = _640x480;
else if (iResX < 1024 || iResY < 768)
iResolution = _800x600;
else
iResolution = _1024x768;
break;
default: // 800x600
iResolution = _800x600;