Merged from revision: 7372

- Added custom game resolution (by Buggler)
- Minor additions to editor popup text (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7374 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-08-05 17:03:16 +00:00
parent 29e09f869e
commit 8dabe65ba6
10 changed files with 27 additions and 17 deletions
+9
View File
@@ -1612,6 +1612,15 @@ void GetRuntimeSettings( )
iResX = 2560;
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;
}
break;
default: // 800x600
iResolution = _800x600;
iResX = 800;