thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Attempt to fix DC and iPhone backends compilation

Browse source 
svn-id: r43650
This commit is contained in:
Eugene Sandulenko 2009-08-22 13:34:38 +00:00
parent ee0e1bfcea
commit ad507d3387
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/platform/dc/dc.h
View file

@ -84,7 +84,7 @@ class OSystem_Dreamcast : private DCHardware, public BaseBackend, public Filesys
// Set the size of the video bitmap. // Set the size of the video bitmap.
// Typically, 320x200 // Typically, 320x200
void initSize(uint w, uint h); void initSize(uint w, uint h, const Graphics::PixelFormat *format);
int16 getHeight() { return _screen_h; } int16 getHeight() { return _screen_h; }
int16 getWidth() { return _screen_w; } int16 getWidth() { return _screen_w; }
@ -105,7 +105,7 @@ class OSystem_Dreamcast : private DCHardware, public BaseBackend, public Filesys
void warpMouse(int x, int y); void warpMouse(int x, int y);
// Set the bitmap that's used when drawing the cursor. // 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. // Replace the specified range of cursor the palette with new colors.
void setCursorPalette(const byte *colors, uint start, uint num); void setCursorPalette(const byte *colors, uint start, uint num);

4
backends/platform/dc/display.cpp
View file

@ -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); 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, void OSystem_Dreamcast::setMouseCursor(const byte *buf, uint w, uint h,
int hotspot_x, int hotspot_y, int hotspot_x, int hotspot_y,
byte keycolor, int cursorTargetScale) byte keycolor, int cursorTargetScale, const Graphics::PixelFormat *format)
{ {
_ms_cur_w = w; _ms_cur_w = w;
_ms_cur_h = h; _ms_cur_h = h;

4
backends/platform/iphone/osys_main.h
View file

@ -126,7 +126,7 @@ public:
bool setGraphicsMode(const char *name); bool setGraphicsMode(const char *name);
virtual bool setGraphicsMode(int mode); virtual bool setGraphicsMode(int mode);
virtual int getGraphicsMode() const; 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 getHeight();
virtual int16 getWidth(); virtual int16 getWidth();
virtual void setPalette(const byte *colors, uint start, uint num); virtual void setPalette(const byte *colors, uint start, uint num);
@ -149,7 +149,7 @@ public:
virtual bool showMouse(bool visible); virtual bool showMouse(bool visible);
virtual void warpMouse(int x, int y); 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 bool pollEvent(Common::Event &event);
virtual uint32 getMillis(); virtual uint32 getMillis();

4
backends/platform/iphone/osys_video.cpp
View file

@ -46,7 +46,7 @@ int OSystem_IPHONE::getGraphicsMode() const {
return -1; 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); //printf("initSize(%i, %i)\n", width, height);
_screenWidth = width; _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); //printf("setMouseCursor(%i, %i)\n", hotspotX, hotspotY);
if (_mouseBuf != NULL && (_mouseWidth != w || _mouseHeight != h)) { if (_mouseBuf != NULL && (_mouseWidth != w || _mouseHeight != h)) {