diff options
| author | Johannes Schickel | 2012-06-16 03:10:43 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-06-16 03:28:42 +0200 |
| commit | d27d951d0b079a301ea1c6a3731bc1fc83234cff (patch) | |
| tree | 89ba167aa2060ef72e2d33aa3536380852926f5d /backends/graphics/opengl | |
| parent | 58bf8090cc760cd3c02724ae4479494d3b3a2cc1 (diff) | |
| download | scummvm-rg350-d27d951d0b079a301ea1c6a3731bc1fc83234cff.tar.gz scummvm-rg350-d27d951d0b079a301ea1c6a3731bc1fc83234cff.tar.bz2 scummvm-rg350-d27d951d0b079a301ea1c6a3731bc1fc83234cff.zip | |
BACKENDS: Make OSystem::setMouseCursor take a "const void *" buffer.
This is mainly for consistency with OSystem::copyRectToScreen.
Diffstat (limited to 'backends/graphics/opengl')
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.cpp | 2 | ||||
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp index 033814a4b5..ed63916551 100644 --- a/backends/graphics/opengl/opengl-graphics.cpp +++ b/backends/graphics/opengl/opengl-graphics.cpp @@ -591,7 +591,7 @@ void OpenGLGraphicsManager::warpMouse(int x, int y) { setInternalMousePosition(scaledX, scaledY); } -void OpenGLGraphicsManager::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { +void OpenGLGraphicsManager::setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { #ifdef USE_RGB_COLOR if (format) _cursorFormat = *format; diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h index 350ffa5f34..b2f78187dc 100644 --- a/backends/graphics/opengl/opengl-graphics.h +++ b/backends/graphics/opengl/opengl-graphics.h @@ -104,7 +104,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, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL); + virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL); virtual void setCursorPalette(const byte *colors, uint start, uint num); virtual void displayMessageOnOSD(const char *msg); |