libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Let CursorMan's cursor functions take "const void *" buffers.

Browse Source
This commit is contained in:
Johannes Schickel 2012-06-16 03:14:07 +02:00
parent d27d951d0b
commit e1e1f01b87
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/cursorman.cpp
View File

@ -55,7 +55,7 @@ bool CursorManager::showMouse(bool visible) {
return g_system->showMouse(visible); return g_system->showMouse(visible);
} }
void CursorManager::pushCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { void CursorManager::pushCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) {
Cursor *cur = new Cursor(buf, w, h, hotspotX, hotspotY, keycolor, dontScale, format); Cursor *cur = new Cursor(buf, w, h, hotspotX, hotspotY, keycolor, dontScale, format);
cur->_visible = isVisible(); cur->_visible = isVisible();
@ -98,7 +98,7 @@ void CursorManager::popAllCursors() {
g_system->showMouse(isVisible()); g_system->showMouse(isVisible());
} }
void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { void CursorManager::replaceCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) {
if (_cursorStack.empty()) { if (_cursorStack.empty()) {
pushCursor(buf, w, h, hotspotX, hotspotY, keycolor, dontScale, format); pushCursor(buf, w, h, hotspotX, hotspotY, keycolor, dontScale, format);
@ -225,7 +225,7 @@ void CursorManager::replaceCursorPalette(const byte *colors, uint start, uint nu
} }
} }
CursorManager::Cursor::Cursor(const byte *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { CursorManager::Cursor::Cursor(const void *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) {
#ifdef USE_RGB_COLOR #ifdef USE_RGB_COLOR
if (!format) if (!format)
_format = Graphics::PixelFormat::createFormatCLUT8(); _format = Graphics::PixelFormat::createFormatCLUT8();

6
graphics/cursorman.h
View File

@ -71,7 +71,7 @@ public:
* useful to push a "dummy" cursor and modify it later. The * useful to push a "dummy" cursor and modify it later. The
* cursor will be added to the stack, but not to the backend. * cursor will be added to the stack, but not to the backend.
*/ */
void pushCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL); void pushCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL);
/** /**
* Pop a cursor from the stack, and restore the previous one to the * Pop a cursor from the stack, and restore the previous one to the
@ -96,7 +96,7 @@ public:
* @param format a pointer to the pixel format which the cursor graphic uses, * @param format a pointer to the pixel format which the cursor graphic uses,
* CLUT8 will be used if this is NULL or not specified. * CLUT8 will be used if this is NULL or not specified.
*/ */
void replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL); void replaceCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL);
/** /**
* Pop all of the cursors and cursor palettes from their respective stacks. * Pop all of the cursors and cursor palettes from their respective stacks.
@ -181,7 +181,7 @@ private:
uint _size; uint _size;
Cursor(const byte *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL); Cursor(const void *data, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL);
~Cursor(); ~Cursor();
}; };