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

[sev at users.sourceforge.net]

Revision: 43651
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43651&view=rev
Author:   sev
Date:     2009-08-22 14:52:26 +0000 (Sat, 22 Aug 2009)

Log Message:
-----------
Second attempt to fix DC and iPhone backends compilation

Modified Paths:
--------------
    scummvm/trunk/backends/platform/dc/dc.h
    scummvm/trunk/backends/platform/dc/display.cpp
    scummvm/trunk/backends/platform/iphone/osys_main.h
    scummvm/trunk/backends/platform/iphone/osys_video.cpp

Modified: scummvm/trunk/backends/platform/dc/dc.h
===================================================================
--- scummvm/trunk/backends/platform/dc/dc.h	2009-08-22 13:34:38 UTC (rev 43650)
+++ scummvm/trunk/backends/platform/dc/dc.h	2009-08-22 14:52:26 UTC (rev 43651)
@@ -105,7 +105,7 @@
   void warpMouse(int x, int y);
 
   // Set the bitmap that's used when drawing the cursor.
-  void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor, int cursorTargetScale, const Graphics::PixelFormat *format);
+  void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format);
 
   // Replace the specified range of cursor the palette with new colors.
   void setCursorPalette(const byte *colors, uint start, uint num);

Modified: scummvm/trunk/backends/platform/dc/display.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/display.cpp	2009-08-22 13:34:38 UTC (rev 43650)
+++ scummvm/trunk/backends/platform/dc/display.cpp	2009-08-22 14:52:26 UTC (rev 43651)
@@ -263,7 +263,7 @@
 
 void OSystem_Dreamcast::setMouseCursor(const byte *buf, uint w, uint h,
 				       int hotspot_x, int hotspot_y,
-				       byte keycolor, int cursorTargetScale, const Graphics::PixelFormat *format)
+				       uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format)
 {
   _ms_cur_w = w;
   _ms_cur_h = h;
@@ -271,7 +271,7 @@
   _ms_hotspot_x = hotspot_x;
   _ms_hotspot_y = hotspot_y;
 
-  _ms_keycolor = keycolor;
+  _ms_keycolor = (byte)keycolor;
 
   if (_ms_buf)
     free(_ms_buf);

Modified: scummvm/trunk/backends/platform/iphone/osys_main.h
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_main.h	2009-08-22 13:34:38 UTC (rev 43650)
+++ scummvm/trunk/backends/platform/iphone/osys_main.h	2009-08-22 14:52:26 UTC (rev 43651)
@@ -149,7 +149,7 @@
 	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, const Graphics::PixelFormat *format = NULL);
+	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 255, int cursorTargetScale = 1, const Graphics::PixelFormat *format = NULL);
 
 	virtual bool pollEvent(Common::Event &event);
 	virtual uint32 getMillis();

Modified: scummvm/trunk/backends/platform/iphone/osys_video.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_video.cpp	2009-08-22 13:34:38 UTC (rev 43650)
+++ scummvm/trunk/backends/platform/iphone/osys_video.cpp	2009-08-22 14:52:26 UTC (rev 43651)
@@ -438,7 +438,7 @@
 	}
 }
 
-void OSystem_IPHONE::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
+void OSystem_IPHONE::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
 	//printf("setMouseCursor(%i, %i)\n", hotspotX, hotspotY);
 
 	if (_mouseBuf != NULL && (_mouseWidth != w || _mouseHeight != h)) {
@@ -455,7 +455,7 @@
 	_mouseHotspotX = hotspotX;
 	_mouseHotspotY = hotspotY;
 
-	_mouseKeyColour = keycolor;
+	_mouseKeyColour = (byte)keycolor;
 
 	memcpy(_mouseBuf, buf, w * h);
 


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