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/dc | |
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/dc')
-rw-r--r-- | backends/platform/dc/dc.h | 2 | ||||
-rw-r--r-- | backends/platform/dc/display.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index f1d3c7af28..f5d200968e 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -105,7 +105,7 @@ class OSystem_Dreamcast : private DCHardware, public BaseBackend, public Filesys 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); diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp index 9a2510f8fc..c6be514e36 100644 --- a/backends/platform/dc/display.cpp +++ b/backends/platform/dc/display.cpp @@ -263,7 +263,7 @@ void OSystem_Dreamcast::warpMouse(int x, int y) 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 @@ void OSystem_Dreamcast::setMouseCursor(const byte *buf, uint w, uint h, _ms_hotspot_x = hotspot_x; _ms_hotspot_y = hotspot_y; - _ms_keycolor = keycolor; + _ms_keycolor = (byte)keycolor; if (_ms_buf) free(_ms_buf); |