diff options
author | Jody Northup | 2009-06-30 07:30:57 +0000 |
---|---|---|
committer | Jody Northup | 2009-06-30 07:30:57 +0000 |
commit | 9e1916bcad3cc33a870bdbff5bd01b39e523492d (patch) | |
tree | 557ec11652f89b3323c1bcc117df2eedebfca817 /graphics/cursorman.cpp | |
parent | 6f644324863437dedecb254bf088b33c914c7241 (diff) | |
download | scummvm-rg350-9e1916bcad3cc33a870bdbff5bd01b39e523492d.tar.gz scummvm-rg350-9e1916bcad3cc33a870bdbff5bd01b39e523492d.tar.bz2 scummvm-rg350-9e1916bcad3cc33a870bdbff5bd01b39e523492d.zip |
renamed kTransactionPixelFormatNotSupported to kTransactionFormatNotSupported, retyped all Graphics::PixelFormat * parameters to const Graphics::PixelFormat *, (hopefully) repaired all memory leaks on screen and cursor format changes, provided OSystem::getScreenFormat and OSystem::getSupportedFormats methods for when ENABLE_RGB_COLOR is not set, completely forgot the "commit early, commit often" mantra.
svn-id: r41972
Diffstat (limited to 'graphics/cursorman.cpp')
-rw-r--r-- | graphics/cursorman.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp index bf6de44fbf..b35bbe73ae 100644 --- a/graphics/cursorman.cpp +++ b/graphics/cursorman.cpp @@ -57,7 +57,7 @@ bool CursorManager::showMouse(bool visible) { return g_system->showMouse(visible); } -void CursorManager::pushCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int targetScale, Graphics::PixelFormat *format) { +void CursorManager::pushCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int targetScale, const Graphics::PixelFormat *format) { Cursor *cur = new Cursor(buf, w, h, hotspotX, hotspotY, keycolor, targetScale, format); cur->_visible = isVisible(); @@ -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()); @@ -100,7 +100,7 @@ void CursorManager::popAllCursors() { g_system->showMouse(isVisible()); } -void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int targetScale, Graphics::PixelFormat *format) { +void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int targetScale, const Graphics::PixelFormat *format) { if (_cursorStack.empty()) { pushCursor(buf, w, h, hotspotX, hotspotY, keycolor, targetScale, format); @@ -110,10 +110,10 @@ void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, Cursor *cur = _cursorStack.top(); #ifdef ENABLE_RGB_COLOR + uint size; if (!format) - format = new Graphics::PixelFormat(1,8,8,8,8,0,0,0,0); - - uint size = w * h * format->bytesPerPixel; + size = w * h; + else size = w * h * format->bytesPerPixel; #else uint size = w * h; #endif @@ -134,7 +134,7 @@ void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, cur->_keycolor = keycolor; cur->_targetScale = targetScale; #ifdef ENABLE_RGB_COLOR - cur->_format = *format; + cur->_format = format; #endif g_system->setMouseCursor(cur->_data, w, h, hotspotX, hotspotY, keycolor, targetScale, format); |