[Scummvm-cvs-logs] SF.net SVN: scummvm:[43605] scummvm/trunk/backends/platform/wii

[dhewg at users.sourceforge.net]

Revision: 43605
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43605&view=rev
Author:   dhewg
Date:     2009-08-21 18:53:28 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
Fixed OSystem_Wii for the 16bit API changes

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wii/osystem.h
    scummvm/trunk/backends/platform/wii/osystem_gfx.cpp

Modified: scummvm/trunk/backends/platform/wii/osystem.h
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem.h	2009-08-21 18:16:37 UTC (rev 43604)
+++ scummvm/trunk/backends/platform/wii/osystem.h	2009-08-21 18:53:28 UTC (rev 43605)
@@ -120,7 +120,8 @@
 	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 @@
 									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();

Modified: scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem_gfx.cpp	2009-08-21 18:16:37 UTC (rev 43604)
+++ scummvm/trunk/backends/platform/wii/osystem_gfx.cpp	2009-08-21 18:53:28 UTC (rev 43605)
@@ -143,7 +143,8 @@
 	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 @@
 	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::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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.