diff options
| author | Eugene Sandulenko | 2006-11-13 13:53:14 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-11-13 13:53:14 +0000 |
| commit | 75b062b89f30940b51f32e4369e30b2a0b01ab13 (patch) | |
| tree | f1208bdcb61150a62d42035f18fe2a8b7bf7e800 /backends/platform | |
| parent | 4d840e52953a7b297f67fe289c8476c874d6ca35 (diff) | |
| download | scummvm-rg350-75b062b89f30940b51f32e4369e30b2a0b01ab13.tar.gz scummvm-rg350-75b062b89f30940b51f32e4369e30b2a0b01ab13.tar.bz2 scummvm-rg350-75b062b89f30940b51f32e4369e30b2a0b01ab13.zip | |
Implement FR #1595534: "Touche: Aspect Ratio Correction"
svn-id: r24706
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/graphics.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl-common.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp index 59bc5e997b..cb8457fbdb 100644 --- a/backends/platform/sdl/graphics.cpp +++ b/backends/platform/sdl/graphics.cpp @@ -316,7 +316,7 @@ void OSystem_SDL::loadGFXMode() { _overlayWidth = _screenWidth * _scaleFactor; _overlayHeight = _screenHeight * _scaleFactor; - if (_screenHeight != 200) + if (_screenHeight != 200 && _screenHeight != 400) _adjustAspectRatio = false; if (_adjustAspectRatio) @@ -735,7 +735,7 @@ void OSystem_SDL::setFullscreenMode(bool enable) { } void OSystem_SDL::setAspectRatioCorrection(bool enable) { - if ((_screenHeight == 200 && _adjustAspectRatio != enable) || + if (((_screenHeight == 200 || _screenHeight == 400) && _adjustAspectRatio != enable) || _transactionMode == kTransactionCommit) { Common::StackLock lock(_graphicsMutex); diff --git a/backends/platform/sdl/sdl-common.h b/backends/platform/sdl/sdl-common.h index 41e33b5b5d..27a4d25e78 100644 --- a/backends/platform/sdl/sdl-common.h +++ b/backends/platform/sdl/sdl-common.h @@ -399,7 +399,10 @@ protected: virtual bool saveScreenshot(const char *filename); // overloaded by CE backend - int effectiveScreenHeight() const { return (_adjustAspectRatio ? 240 : _screenHeight) * _scaleFactor; } + int effectiveScreenHeight() const { + return (_adjustAspectRatio ? real2Aspect(_screenHeight) : _screenHeight) + * _scaleFactor; + } void setupIcon(); void handleKbdMouse(); |