aboutsummaryrefslogtreecommitdiff
path: root/graphics/cursorman.cpp
diff options
context:
space:
mode:
authorJody Northup2009-06-26 10:37:00 +0000
committerJody Northup2009-06-26 10:37:00 +0000
commit27e50db5d7cdbed498d6a61b1ee1ad5405ce33a2 (patch)
tree69b15c5697f95dfd1b28206e68c149fc17b8903d /graphics/cursorman.cpp
parent2859c9130462e66df705d534f9a70d1430628be7 (diff)
downloadscummvm-rg350-27e50db5d7cdbed498d6a61b1ee1ad5405ce33a2.tar.gz
scummvm-rg350-27e50db5d7cdbed498d6a61b1ee1ad5405ce33a2.tar.bz2
scummvm-rg350-27e50db5d7cdbed498d6a61b1ee1ad5405ce33a2.zip
Converted OSystem::SetMouseCursor to take pointer to PixelFormat, instead of full PixelFormat. Removed OSystem::setCursorFormat (since I forgot to do so several commits ago)
svn-id: r41901
Diffstat (limited to 'graphics/cursorman.cpp')
-rw-r--r--graphics/cursorman.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp
index 574950a09b..bf6de44fbf 100644
--- a/graphics/cursorman.cpp
+++ b/graphics/cursorman.cpp
@@ -64,7 +64,7 @@ void CursorManager::pushCursor(const byte *buf, uint w, uint h, int hotspotX, in
_cursorStack.push(cur);
if (buf) {
- g_system->setMouseCursor(cur->_data, w, h, hotspotX, hotspotY, keycolor, targetScale, *format);
+ g_system->setMouseCursor(cur->_data, w, h, hotspotX, hotspotY, keycolor, targetScale, format);
}
}
@@ -77,7 +77,7 @@ void CursorManager::popCursor() {
if (!_cursorStack.empty()) {
cur = _cursorStack.top();
- g_system->setMouseCursor(cur->_data, cur->_width, cur->_height, cur->_hotspotX, cur->_hotspotY, cur->_keycolor, cur->_targetScale, cur->_format);
+ g_system->setMouseCursor(cur->_data, cur->_width, cur->_height, cur->_hotspotX, cur->_hotspotY, cur->_keycolor, cur->_targetScale, &(cur->_format));
}
g_system->showMouse(isVisible());
@@ -137,7 +137,7 @@ void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX,
cur->_format = *format;
#endif
- g_system->setMouseCursor(cur->_data, w, h, hotspotX, hotspotY, keycolor, targetScale, *format);
+ g_system->setMouseCursor(cur->_data, w, h, hotspotX, hotspotY, keycolor, targetScale, format);
}
void CursorManager::disableCursorPalette(bool disable) {