diff options
author | John Willis | 2010-09-06 17:28:17 +0000 |
---|---|---|
committer | John Willis | 2010-09-06 17:28:17 +0000 |
commit | 2e1b4278e2aa188e67c20b88d78260fd6dd6b429 (patch) | |
tree | f8320651bffc9e124d25272009b74f0841922831 /backends/platform/sdl | |
parent | e81dad8e61fca9ca740051fcfcec639354689875 (diff) | |
download | scummvm-rg350-2e1b4278e2aa188e67c20b88d78260fd6dd6b429.tar.gz scummvm-rg350-2e1b4278e2aa188e67c20b88d78260fd6dd6b429.tar.bz2 scummvm-rg350-2e1b4278e2aa188e67c20b88d78260fd6dd6b429.zip |
SDL: Add masks to the SDL backend to support the OpenPandora backend.
svn-id: r52599
Diffstat (limited to 'backends/platform/sdl')
-rw-r--r-- | backends/platform/sdl/graphics.cpp | 4 | ||||
-rw-r--r-- | backends/platform/sdl/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp index 9bf71d1c33..69144dcc01 100644 --- a/backends/platform/sdl/graphics.cpp +++ b/backends/platform/sdl/graphics.cpp @@ -539,7 +539,7 @@ bool OSystem_SDL::loadGFXMode() { assert(_inited); _forceFull = true; -#if !defined(__MAEMO__) && !defined(GP2XWIZ) && !defined(LINUXMOTO) && !defined(DINGUX) +#if !defined(__MAEMO__) && !defined(GP2XWIZ) && !defined(LINUXMOTO) && !defined(DINGUX) && !defined(OPENPANDORA) _videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor; _videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor; @@ -785,7 +785,7 @@ void OSystem_SDL::internUpdateScreen() { #endif // If the shake position changed, fill the dirty area with blackness - if (_currentShakePos != _newShakePos || + if (_currentShakePos != _newShakePos || (_mouseNeedsRedraw && _mouseBackup.y <= _currentShakePos)) { SDL_Rect blackrect = {0, 0, _videoMode.screenWidth * _videoMode.scaleFactor, _newShakePos * _videoMode.scaleFactor}; diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp index 9d116d325a..c27ccc09d4 100644 --- a/backends/platform/sdl/main.cpp +++ b/backends/platform/sdl/main.cpp @@ -38,7 +38,7 @@ // Several SDL based ports use a custom main, and hence do not want to compile // of this file. The following "#if" ensures that. -#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ)&& !defined(LINUXMOTO) && !defined(__SYMBIAN32__) && !defined(DINGUX) +#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(CAANOO) && !defined(GP2XWIZ) && !defined(LINUXMOTO) && !defined(OPENPANDORA) && !defined(__SYMBIAN32__) && !defined(DINGUX) #include "backends/platform/sdl/sdl.h" |