aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorJoost Peters2009-08-21 19:11:02 +0000
committerJoost Peters2009-08-21 19:11:02 +0000
commit7d350b215c62f6d08c9bc33da9648fd72ee5599e (patch)
treee0828cb6e606d3a8729fce75b3ba574faebaad6a /backends
parentd6f3e28c2db6dd31e17cf304586de2f91d489791 (diff)
downloadscummvm-rg350-7d350b215c62f6d08c9bc33da9648fd72ee5599e.tar.gz
scummvm-rg350-7d350b215c62f6d08c9bc33da9648fd72ee5599e.tar.bz2
scummvm-rg350-7d350b215c62f6d08c9bc33da9648fd72ee5599e.zip
fix compilation after RGB API changes
svn-id: r43606
Diffstat (limited to 'backends')
-rw-r--r--backends/platform/psp/osys_psp.cpp6
-rw-r--r--backends/platform/psp/osys_psp.h4
-rw-r--r--backends/platform/psp/osys_psp_gu.cpp6
-rw-r--r--backends/platform/psp/osys_psp_gu.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index 5e461f45e0..d4b1c61537 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -143,7 +143,7 @@ int OSystem_PSP::getGraphicsMode() const {
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 @@ void OSystem_PSP::warpMouse(int x, int y) {
_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 @@ void OSystem_PSP::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX,
_mouseHotspotX = hotspotX;
_mouseHotspotY = hotspotY;
- _mouseKeyColour = keycolor;
+ _mouseKeyColour = keycolor & 0xFF;
free(_mouseBuf);
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 94488a92ce..68e1a7da22 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -97,7 +97,7 @@ public:
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 @@ public:
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();
diff --git a/backends/platform/psp/osys_psp_gu.cpp b/backends/platform/psp/osys_psp_gu.cpp
index 1c83aa4abf..c13c5bc21f 100644
--- a/backends/platform/psp/osys_psp_gu.cpp
+++ b/backends/platform/psp/osys_psp_gu.cpp
@@ -141,7 +141,7 @@ OSystem_PSP_GU::~OSystem_PSP_GU() {
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 @@ int OSystem_PSP_GU::getGraphicsMode() const {
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 @@ void OSystem_PSP_GU::setMouseCursor(const byte *buf, uint w, uint h, int hotspot
_mouseHotspotX = hotspotX;
_mouseHotspotY = hotspotY;
- _mouseKeyColour = keycolor;
+ _mouseKeyColour = keycolor & 0xFF;
memcpy(mouseClut, _palette, 256*sizeof(unsigned short));
mouseClut[_mouseKeyColour] = 0;
diff --git a/backends/platform/psp/osys_psp_gu.h b/backends/platform/psp/osys_psp_gu.h
index c221971fc8..106b73b308 100644
--- a/backends/platform/psp/osys_psp_gu.h
+++ b/backends/platform/psp/osys_psp_gu.h
@@ -39,12 +39,12 @@ public:
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);