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

[sev at users.sourceforge.net]

Revision: 43650
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43650&view=rev
Author:   sev
Date:     2009-08-22 13:34:38 +0000 (Sat, 22 Aug 2009)

Log Message:
-----------
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:32:56 UTC (rev 43649)
+++ scummvm/trunk/backends/platform/dc/dc.h	2009-08-22 13:34:38 UTC (rev 43650)
@@ -84,7 +84,7 @@
 
   // Set the size of the video bitmap.
   // Typically, 320x200
-  void initSize(uint w, uint h);
+  void initSize(uint w, uint h, const Graphics::PixelFormat *format);
   int16 getHeight() { return _screen_h; }
   int16 getWidth() { return _screen_w; }
 
@@ -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);
+  void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte 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:32:56 UTC (rev 43649)
+++ scummvm/trunk/backends/platform/dc/display.cpp	2009-08-22 13:34:38 UTC (rev 43650)
@@ -193,7 +193,7 @@
   }
 }
 
-void OSystem_Dreamcast::initSize(uint w, uint h)
+void OSystem_Dreamcast::initSize(uint w, uint h, const Graphics::PixelFormat *format)
 {
   assert(w <= SCREEN_W && h <= SCREEN_H);
 
@@ -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)
+				       byte keycolor, int cursorTargetScale, const Graphics::PixelFormat *format)
 {
   _ms_cur_w = w;
   _ms_cur_h = h;

Modified: scummvm/trunk/backends/platform/iphone/osys_main.h
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_main.h	2009-08-22 13:32:56 UTC (rev 43649)
+++ scummvm/trunk/backends/platform/iphone/osys_main.h	2009-08-22 13:34:38 UTC (rev 43650)
@@ -126,7 +126,7 @@
 	bool setGraphicsMode(const char *name);
 	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 getHeight();
 	virtual int16 getWidth();
 	virtual void setPalette(const byte *colors, uint start, uint num);
@@ -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);
+	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 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:32:56 UTC (rev 43649)
+++ scummvm/trunk/backends/platform/iphone/osys_video.cpp	2009-08-22 13:34:38 UTC (rev 43650)
@@ -46,7 +46,7 @@
 	return -1;
 }
 
-void OSystem_IPHONE::initSize(uint width, uint height) {
+void OSystem_IPHONE::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
 	//printf("initSize(%i, %i)\n", width, height);
 
 	_screenWidth = width;
@@ -438,7 +438,7 @@
 	}
 }
 
-void OSystem_IPHONE::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale) {
+void OSystem_IPHONE::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
 	//printf("setMouseCursor(%i, %i)\n", hotspotX, hotspotY);
 
 	if (_mouseBuf != NULL && (_mouseWidth != w || _mouseHeight != h)) {


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