diff options
| author | Kamil Zbróg | 2014-01-12 18:44:51 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2014-01-12 18:44:51 +0000 |
| commit | 444934a0accec982f55db92c17ef65270fe18e66 (patch) | |
| tree | f62210b1ff15696accd87d97b68b03688a153156 /backends/graphics/surfacesdl | |
| parent | e94fabc37407a7d300af04493b0f5cbced42a092 (diff) | |
| parent | 1a4f951f8bff52f6185304722f2ab9cf9bcd58f4 (diff) | |
| download | scummvm-rg350-444934a0accec982f55db92c17ef65270fe18e66.tar.gz scummvm-rg350-444934a0accec982f55db92c17ef65270fe18e66.tar.bz2 scummvm-rg350-444934a0accec982f55db92c17ef65270fe18e66.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'backends/graphics/surfacesdl')
| -rw-r--r-- | backends/graphics/surfacesdl/surfacesdl-graphics.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp index c946b8e747..0a4dcf3ea3 100644 --- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp +++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp @@ -267,7 +267,11 @@ const OSystem::GraphicsMode *SurfaceSdlGraphicsManager::getSupportedGraphicsMode } int SurfaceSdlGraphicsManager::getDefaultGraphicsMode() const { +#ifdef USE_SCALERS return GFX_DOUBLESIZE; +#else + return GFX_NORMAL; +#endif } void SurfaceSdlGraphicsManager::resetGraphicsScale() { @@ -1076,7 +1080,9 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() { for (r = _dirtyRectList; r != lastRect; ++r) { register int dst_y = r->y + _currentShakePos; register int dst_h = 0; +#ifdef USE_SCALERS register int orig_dst_y = 0; +#endif register int rx1 = r->x * scale1; if (dst_y < height) { @@ -1084,7 +1090,9 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() { if (dst_h > height - dst_y) dst_h = height - dst_y; +#ifdef USE_SCALERS orig_dst_y = dst_y; +#endif dst_y = dst_y * scale1; if (_videoMode.aspectRatioCorrection && !_overlayVisible) |