1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Added support for new resolution: 960x540

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
Standard Gaming Platform/sgp.cpp
+14 -7
View File
@@ -1520,6 +1520,10 @@ void GetRuntimeSettings( )
iResX = 640; iResX = 640;
iResY = 480; iResY = 480;
break; break;
case _960x540:
iResX = 960;
iResY = 540;
break;
case _800x600: case _800x600:
iResX = 800; iResX = 800;
iResY = 600; iResY = 600;
@@ -1613,13 +1617,16 @@ void GetRuntimeSettings( )
iResY = 1600; iResY = 1600;
break; break;
case _CustomRes: case _CustomRes:
iResX = max( (int)oProps.getIntProperty(L"Ja2 Settings", L"CUSTOM_SCREEN_RESOLUTION_X", -1), 800 ); 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), 600 ); iResY = max( (int)oProps.getIntProperty(L"Ja2 Settings", L"CUSTOM_SCREEN_RESOLUTION_Y", -1), 480 );
if ( iResX < 1024 || iResY < 768 )
{ if (iResX < 800 || iResY < 600)
// Buggler: hack to use 800x600 interface iResolution = _640x480;
iResolution = _1280x720; else if (iResX < 1024 || iResY < 768)
} iResolution = _800x600;
else
iResolution = _1024x768;
break; break;
default: // 800x600 default: // 800x600
iResolution = _800x600; iResolution = _800x600;
local.h
+26 -24
View File
@@ -47,33 +47,35 @@ typedef enum
// The 640x480 resolution should always be the FIRST entry in this enum // The 640x480 resolution should always be the FIRST entry in this enum
_640x480 = 0, _640x480 = 0,
_960x540 = 1,
// Place all resolutions that have both (a lower height AND a lower width) BEFORE the 800x600 resolution // Place all resolutions that have both (a lower height AND a lower width) BEFORE the 800x600 resolution
_800x600 = 1, _800x600 = 2,
_1024x600 = 2, _1024x600 = 3,
_1280x720 = 3, _1280x720 = 4,
// Place all resolutions that have both (a lower height AND a lower width) BEFORE the 1024x768 resolution // Place all resolutions that have both (a lower height AND a lower width) BEFORE the 1024x768 resolution
_1024x768 = 4, _1024x768 = 5,
_1280x768 = 5, _1280x768 = 6,
_1360x768 = 6, _1360x768 = 7,
_1366x768 = 7, _1366x768 = 8,
_1280x800 = 8, _1280x800 = 9,
_1440x900 = 9, _1440x900 = 10,
_1600x900 = 10, _1600x900 = 11,
_1280x960 = 11, _1280x960 = 12,
_1440x960 = 12, _1440x960 = 13,
_1770x1000 = 13, _1770x1000 = 14,
_1280x1024 = 14, _1280x1024 = 15,
_1360x1024 = 15, _1360x1024 = 16,
_1600x1024 = 16, _1600x1024 = 17,
_1440x1050 = 17, _1440x1050 = 18,
_1680x1050 = 18, _1680x1050 = 19,
_1920x1080 = 19, _1920x1080 = 20,
_1600x1200 = 20, _1600x1200 = 21,
_1920x1200 = 21, _1920x1200 = 22,
_2560x1440 = 22, _2560x1440 = 23,
_2560x1600 = 23, _2560x1600 = 24,
_CustomRes = 24, _CustomRes = 25,
} SCREEN_RESOLUTION; } SCREEN_RESOLUTION;
extern BOOLEAN fDisplayOverheadMap; extern BOOLEAN fDisplayOverheadMap;