diff options
| author | Jody Northup | 2009-06-16 09:15:06 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-16 09:15:06 +0000 |
| commit | db9cfc6f962790a270b357c3d47a5dc0e15a37b0 (patch) | |
| tree | 051c22ce24f70ec5a231e1838a9b0e3f466c6872 | |
| parent | cb56169a2770c25ce27256db339353011158998f (diff) | |
| download | scummvm-rg350-db9cfc6f962790a270b357c3d47a5dc0e15a37b0.tar.gz scummvm-rg350-db9cfc6f962790a270b357c3d47a5dc0e15a37b0.tar.bz2 scummvm-rg350-db9cfc6f962790a270b357c3d47a5dc0e15a37b0.zip | |
Corrected oversight in earlier ifdef simplification which leads to compilation failure if ENABLE_16BIT is not defined.
svn-id: r41581
| -rw-r--r-- | backends/platform/sdl/sdl.h | 4 | ||||
| -rw-r--r-- | common/system.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index b788022d57..074a55069d 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -133,11 +133,9 @@ public: virtual void warpMouse(int x, int y); // overloaded by CE backend (FIXME) // Set the bitmap that's used when drawing the cursor. -#ifdef ENABLE_16BIT virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale); // overloaded by CE backend (FIXME) +#ifdef ENABLE_16BIT virtual void setCursorFormat(Graphics::PixelFormat format); -#else - virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor, int cursorTargetScale); // overloaded by CE backend (FIXME) #endif // Set colors of cursor palette diff --git a/common/system.h b/common/system.h index b6e78474ca..7df4a124e3 100644 --- a/common/system.h +++ b/common/system.h @@ -719,11 +719,9 @@ public: * @param keycolor transparency color index * @param cursorTargetScale scale factor which cursor is designed for */ -#ifdef ENABLE_16BIT virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int cursorTargetScale = 1) = 0; +#ifdef ENABLE_16BIT virtual void setCursorFormat(Graphics::PixelFormat format) = 0; -#else - virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int cursorTargetScale = 1) = 0; #endif |