aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorRobin Watts2009-08-21 22:29:28 +0000
committerRobin Watts2009-08-21 22:29:28 +0000
commit894635e91d7bdaa4517618a957441db016b2798b (patch)
treed6c6fa71c6661a1cc6682bce3cd6476a80ed4c32 /backends
parentedc8ffdaba5756c37aa84be5b933bc238c759ec2 (diff)
downloadscummvm-rg350-894635e91d7bdaa4517618a957441db016b2798b.tar.gz
scummvm-rg350-894635e91d7bdaa4517618a957441db016b2798b.tar.bz2
scummvm-rg350-894635e91d7bdaa4517618a957441db016b2798b.zip
Attempt to fix builds that use the ARM screen column clear code; add new
bitdepth argument that was missing in ARM builds previously. Also fix a few warnings. Also fix the WinCE build which fails in the SDL init call with a missing bitdepth field. Untested at this point (build certainly gets further than before). Committing this seems reasonable, as it can't make it any worse :) svn-id: r43614
Diffstat (limited to 'backends')
-rw-r--r--backends/platform/wince/wince-sdl.cpp4
-rw-r--r--backends/platform/wince/wince-sdl.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index 65082014da..ab7860dd85 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -1084,7 +1084,7 @@ void OSystem_WINCE3::update_game_settings() {
_noDoubleTapRMB = ConfMan.getBool("no_doubletap_rightclick");
}
-void OSystem_WINCE3::initSize(uint w, uint h) {
+void OSystem_WINCE3::initSize(uint w, uint h, const Graphics::PixelFormat *format) {
if (_hasSmartphoneResolution && h == 240)
h = 200; // mainly for the launcher
@@ -1120,7 +1120,7 @@ void OSystem_WINCE3::initSize(uint w, uint h) {
_videoMode.overlayWidth = w;
_videoMode.overlayHeight = h;
- OSystem_SDL::initSize(w, h);
+ OSystem_SDL::initSize(w, h, format);
if (_scalersChanged) {
unloadGFXMode();
diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h
index deafde6d80..7b4d0f2b25 100644
--- a/backends/platform/wince/wince-sdl.h
+++ b/backends/platform/wince/wince-sdl.h
@@ -66,7 +66,7 @@ public:
void internUpdateScreen();
void setGraphicsModeIntern();
- void initSize(uint w, uint h);
+ void initSize(uint w, uint h, const Graphics::PixelFormat *format);
void initBackend();
// Overloaded from SDL backend (toolbar handling)