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

[joostp at users.sourceforge.net]

Revision: 43606
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43606&view=rev
Author:   joostp
Date:     2009-08-21 19:11:02 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
fix compilation after RGB API changes

Modified Paths:
--------------
    scummvm/trunk/backends/platform/psp/osys_psp.cpp
    scummvm/trunk/backends/platform/psp/osys_psp.h
    scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp
    scummvm/trunk/backends/platform/psp/osys_psp_gu.h

Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp	2009-08-21 18:53:28 UTC (rev 43605)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp	2009-08-21 19:11:02 UTC (rev 43606)
@@ -143,7 +143,7 @@
 	return -1;
 }
 
-void OSystem_PSP::initSize(uint width, uint height) {
+void OSystem_PSP::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
 	_overlayWidth = _screenWidth = width;
 	_overlayHeight = _screenHeight = height;
 
@@ -382,7 +382,7 @@
 	_mouseY = y;
 }
 
-void OSystem_PSP::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale) {
+void OSystem_PSP::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
 	//TODO: handle cursorTargetScale
 	_mouseWidth = w;
 	_mouseHeight = h;
@@ -390,7 +390,7 @@
 	_mouseHotspotX = hotspotX;
 	_mouseHotspotY = hotspotY;
 
-	_mouseKeyColour = keycolor;
+	_mouseKeyColour = keycolor & 0xFF;
 
 	free(_mouseBuf);
 

Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h	2009-08-21 18:53:28 UTC (rev 43605)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h	2009-08-21 19:11:02 UTC (rev 43606)
@@ -97,7 +97,7 @@
 	virtual bool setGraphicsMode(int mode);
 	bool setGraphicsMode(const char *name);
 	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);
@@ -120,7 +120,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, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format);
 
 	virtual bool pollEvent(Common::Event &event);
 	virtual uint32 getMillis();

Modified: scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp	2009-08-21 18:53:28 UTC (rev 43605)
+++ scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp	2009-08-21 19:11:02 UTC (rev 43606)
@@ -141,7 +141,7 @@
 	 sceGuTerm();
 }
 
-void OSystem_PSP_GU::initSize(uint width, uint height) {
+void OSystem_PSP_GU::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
 	PSPDebugTrace("initSize\n");
 	_screenWidth = width;
 	_screenHeight = height;
@@ -192,7 +192,7 @@
 	return _graphicMode;
 }
 
-void OSystem_PSP_GU::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale) {
+void OSystem_PSP_GU::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
 	//TODO: handle cursorTargetScale
 	_mouseWidth = w;
 	_mouseHeight = h;
@@ -200,7 +200,7 @@
 	_mouseHotspotX = hotspotX;
 	_mouseHotspotY = hotspotY;
 
-	_mouseKeyColour = keycolor;
+	_mouseKeyColour = keycolor & 0xFF;
 
 	memcpy(mouseClut, _palette, 256*sizeof(unsigned short));
 	mouseClut[_mouseKeyColour] = 0;

Modified: scummvm/trunk/backends/platform/psp/osys_psp_gu.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp_gu.h	2009-08-21 18:53:28 UTC (rev 43605)
+++ scummvm/trunk/backends/platform/psp/osys_psp_gu.h	2009-08-21 19:11:02 UTC (rev 43606)
@@ -39,12 +39,12 @@
 	OSystem_PSP_GU();
 	~OSystem_PSP_GU();
 	void updateScreen();
-	void initSize(uint width, uint height);
+	void initSize(uint width, uint height, const Graphics::PixelFormat *format);
 	int getDefaultGraphicsMode() const;
 	bool setGraphicsMode(int mode);
 	bool setGraphicsMode(const char *name);
 	int getGraphicsMode() const;
-	void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale);
+	void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format);
 	void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) ;
 	void setPalette(const byte *colors, uint start, uint num);
 	void setCursorPalette(const byte *colors, uint start, uint num);


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