diff options
author | Eugene Sandulenko | 2009-08-22 14:52:26 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2009-08-22 14:52:26 +0000 |
commit | 95c5d240447879397b74a65490644a3ac7e3d461 (patch) | |
tree | dcb4700bedc60578ed707c3fe6dde83c2330df8c /backends/platform/iphone | |
parent | ad507d3387bc54206a4df5137012c90c6a93aba6 (diff) | |
download | scummvm-rg350-95c5d240447879397b74a65490644a3ac7e3d461.tar.gz scummvm-rg350-95c5d240447879397b74a65490644a3ac7e3d461.tar.bz2 scummvm-rg350-95c5d240447879397b74a65490644a3ac7e3d461.zip |
Second attempt to fix DC and iPhone backends compilation
svn-id: r43651
Diffstat (limited to 'backends/platform/iphone')
-rw-r--r-- | backends/platform/iphone/osys_main.h | 2 | ||||
-rw-r--r-- | backends/platform/iphone/osys_video.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h index 25cfbcd276..c4c1a8b080 100644 --- a/backends/platform/iphone/osys_main.h +++ b/backends/platform/iphone/osys_main.h @@ -149,7 +149,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, 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(); diff --git a/backends/platform/iphone/osys_video.cpp b/backends/platform/iphone/osys_video.cpp index 3926299223..6cb5e18d95 100644 --- a/backends/platform/iphone/osys_video.cpp +++ b/backends/platform/iphone/osys_video.cpp @@ -438,7 +438,7 @@ void OSystem_IPHONE::dirtyFullOverlayScreen() { } } -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 @@ void OSystem_IPHONE::setMouseCursor(const byte *buf, uint w, uint h, int hotspot _mouseHotspotX = hotspotX; _mouseHotspotY = hotspotY; - _mouseKeyColour = keycolor; + _mouseKeyColour = (byte)keycolor; memcpy(_mouseBuf, buf, w * h); |