diff options
author | Eugene Sandulenko | 2009-08-22 13:34:38 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2009-08-22 13:34:38 +0000 |
commit | ad507d3387bc54206a4df5137012c90c6a93aba6 (patch) | |
tree | fbb5b064f920f63045f77d3f4d046b2988cb6198 /backends/platform | |
parent | ee0e1bfceac7eb626737f321e851ef0cdcea08d3 (diff) | |
download | scummvm-rg350-ad507d3387bc54206a4df5137012c90c6a93aba6.tar.gz scummvm-rg350-ad507d3387bc54206a4df5137012c90c6a93aba6.tar.bz2 scummvm-rg350-ad507d3387bc54206a4df5137012c90c6a93aba6.zip |
Attempt to fix DC and iPhone backends compilation
svn-id: r43650
Diffstat (limited to 'backends/platform')
-rw-r--r-- | backends/platform/dc/dc.h | 4 | ||||
-rw-r--r-- | backends/platform/dc/display.cpp | 4 | ||||
-rw-r--r-- | backends/platform/iphone/osys_main.h | 4 | ||||
-rw-r--r-- | backends/platform/iphone/osys_video.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index b67bbb51a1..f1d3c7af28 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -84,7 +84,7 @@ class OSystem_Dreamcast : private DCHardware, public BaseBackend, public Filesys // 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 @@ 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); + 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); diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp index d1e95c6a91..9a2510f8fc 100644 --- a/backends/platform/dc/display.cpp +++ b/backends/platform/dc/display.cpp @@ -193,7 +193,7 @@ void OSystem_Dreamcast::setScaling() } } -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::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) + byte keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) { _ms_cur_w = w; _ms_cur_h = h; diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h index 705f89319a..25cfbcd276 100644 --- a/backends/platform/iphone/osys_main.h +++ b/backends/platform/iphone/osys_main.h @@ -126,7 +126,7 @@ public: 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 @@ 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, byte 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 641c341f50..3926299223 100644 --- a/backends/platform/iphone/osys_video.cpp +++ b/backends/platform/iphone/osys_video.cpp @@ -46,7 +46,7 @@ int OSystem_IPHONE::getGraphicsMode() const { 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::dirtyFullOverlayScreen() { } } -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)) { |