aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorAndre Heider2009-08-21 18:53:28 +0000
committerAndre Heider2009-08-21 18:53:28 +0000
commitd6f3e28c2db6dd31e17cf304586de2f91d489791 (patch)
treec2a10f700fdecd1450b0f155b78d8e2f3ba2326a /backends/platform
parent007f68366fd55a519753bf533c7c3a80db3754f0 (diff)
downloadscummvm-rg350-d6f3e28c2db6dd31e17cf304586de2f91d489791.tar.gz
scummvm-rg350-d6f3e28c2db6dd31e17cf304586de2f91d489791.tar.bz2
scummvm-rg350-d6f3e28c2db6dd31e17cf304586de2f91d489791.zip
Fixed OSystem_Wii for the 16bit API changes
svn-id: r43605
Diffstat (limited to 'backends/platform')
-rw-r--r--backends/platform/wii/osystem.h10
-rw-r--r--backends/platform/wii/osystem_gfx.cpp14
2 files changed, 16 insertions, 8 deletions
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h
index e4176e8415..2eb53f26a3 100644
--- a/backends/platform/wii/osystem.h
+++ b/backends/platform/wii/osystem.h
@@ -120,7 +120,8 @@ public:
virtual int getDefaultGraphicsMode() const;
virtual bool setGraphicsMode(int mode);
virtual int getGraphicsMode() const;
- virtual void initSize(uint width, uint height);
+ virtual void initSize(uint width, uint height,
+ const Graphics::PixelFormat *format);
virtual int16 getWidth();
virtual int16 getHeight();
virtual void setPalette(const byte *colors, uint start, uint num);
@@ -142,14 +143,15 @@ public:
int x, int y, int w, int h);
virtual int16 getOverlayWidth();
virtual int16 getOverlayHeight();
- virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<565>(); }
+ virtual Graphics::PixelFormat getOverlayFormat() const;
virtual bool showMouse(bool visible);
virtual void warpMouse(int x, int y);
virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX,
- int hotspotY, byte keycolor = 255,
- int cursorTargetScale = 1);
+ int hotspotY, uint32 keycolor,
+ int cursorTargetScale,
+ const Graphics::PixelFormat *format);
virtual bool pollEvent(Common::Event &event);
virtual uint32 getMillis();
diff --git a/backends/platform/wii/osystem_gfx.cpp b/backends/platform/wii/osystem_gfx.cpp
index 4454acb318..9c875eaa85 100644
--- a/backends/platform/wii/osystem_gfx.cpp
+++ b/backends/platform/wii/osystem_gfx.cpp
@@ -143,7 +143,8 @@ int OSystem_Wii::getGraphicsMode() const {
return _activeGraphicsMode;
}
-void OSystem_Wii::initSize(uint width, uint height) {
+void OSystem_Wii::initSize(uint width, uint height,
+ const Graphics::PixelFormat *format) {
if (_gameWidth != width || _gameHeight != height) {
printf("initSize %u %u\n", width, height);
@@ -429,6 +430,10 @@ int16 OSystem_Wii::getOverlayHeight() {
return _overlayHeight;
}
+Graphics::PixelFormat OSystem_Wii::getOverlayFormat() const {
+ return Graphics::createPixelFormat<565>();
+}
+
bool OSystem_Wii::showMouse(bool visible) {
bool last = _mouseVisible;
_mouseVisible = visible;
@@ -442,15 +447,16 @@ void OSystem_Wii::warpMouse(int x, int y) {
}
void OSystem_Wii::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX,
- int hotspotY, byte keycolor,
- int cursorTargetScale) {
+ int hotspotY, uint32 keycolor,
+ int cursorTargetScale,
+ const Graphics::PixelFormat *format) {
(void) cursorTargetScale; // TODO
_mouseWidth = w;
_mouseHeight = h;
_mouseHotspotX = hotspotX;
_mouseHotspotY = hotspotY;
- _mouseKeyColor = keycolor;
+ _mouseKeyColor = keycolor & 0xff;
if (_mouseCursor)
free(_mouseCursor);