diff options
author | Paweł Kołodziejski | 2005-03-15 09:43:38 +0000 |
---|---|---|
committer | Paweł Kołodziejski | 2005-03-15 09:43:38 +0000 |
commit | 009cc66a24529eda12ac399c072ea32f20855a09 (patch) | |
tree | bad02cb52d50a6085e21dc708b443843808cce88 /backends/wince | |
parent | 1a368f2e7ce31b2f5cbcc1133e846ad5ca41029f (diff) | |
download | scummvm-rg350-009cc66a24529eda12ac399c072ea32f20855a09.tar.gz scummvm-rg350-009cc66a24529eda12ac399c072ea32f20855a09.tar.bz2 scummvm-rg350-009cc66a24529eda12ac399c072ea32f20855a09.zip |
fixed compilation for for overlay SDL latest changes, and formating code.
Wince SDL port is currently broken, it crash at NULL _screen pointer while locking SDL surface inside OSystem_SDL::clearScreen() func
svn-id: r17152
Diffstat (limited to 'backends/wince')
-rw-r--r-- | backends/wince/wince-sdl.cpp | 32 | ||||
-rw-r--r-- | backends/wince/wince-sdl.h | 13 |
2 files changed, 23 insertions, 22 deletions
diff --git a/backends/wince/wince-sdl.cpp b/backends/wince/wince-sdl.cpp index 1affda9df6..6a3aeaeaaa 100644 --- a/backends/wince/wince-sdl.cpp +++ b/backends/wince/wince-sdl.cpp @@ -733,24 +733,24 @@ void OSystem_WINCE3::update_game_settings() { get_sample_rate(); } -void OSystem_WINCE3::initSize(uint w, uint h, int overlaySize) { +void OSystem_WINCE3::initSize(uint w, uint h, int overlayScale) { - if (_isSmartphone && h == 240) - h = 200; // mainly for the launcher + if (_isSmartphone && h == 240) + h = 200; // mainly for the launcher - switch (_transactionMode) { - case kTransactionActive: - _transactionDetails.w = w; - _transactionDetails.wChanged = true; - _transactionDetails.h = h; - _transactionDetails.hChanged = true; - return; - break; - case kTransactionCommit: - break; - default: - break; - } + switch (_transactionMode) { + case kTransactionActive: + _transactionDetails.w = w; + _transactionDetails.h = h; + _transactionDetails.overlayScale = overlayScale; + _transactionDetails.sizeChanged = true; + return; + break; + case kTransactionCommit: + break; + default: + break; + } if (w == 320 && h == 200 && !_isSmartphone) h = 240; // use the extra 40 pixels height for the toolbar diff --git a/backends/wince/wince-sdl.h b/backends/wince/wince-sdl.h index 6338b839a8..7d92d55b92 100644 --- a/backends/wince/wince-sdl.h +++ b/backends/wince/wince-sdl.h @@ -36,6 +36,8 @@ #include <SDL.h> + + #define TOTAL_ZONES 3 class OSystem_WINCE3 : public OSystem_SDL { @@ -74,6 +76,7 @@ public: //#ifdef WIN32_PLATFORM_WFSP // Smartphone actions + void initZones(); void loadSmartphoneConfigurationElement(String element, int &value, int defaultValue); void loadSmartphoneConfiguration(); @@ -190,15 +193,13 @@ private: int _currentZone; typedef struct zoneDesc { - int x; - int y; - int width; - int height; + int x; + int y; + int width; + int height; } zoneDesc; static zoneDesc _zones[TOTAL_ZONES]; - - }; #endif |