diff options
| author | richiesams | 2013-08-14 10:18:17 -0500 |
|---|---|---|
| committer | richiesams | 2013-08-14 10:18:17 -0500 |
| commit | 4c1e8b3f453fec9e18743a636bcf2d1c83135c2e (patch) | |
| tree | 586e88ffdc0ff36411e1cbe4babe318cb9c8fdc4 /engines | |
| parent | c020c6bf539d2a9fc4f91a422e1f63d9d9f374b3 (diff) | |
| download | scummvm-rg350-4c1e8b3f453fec9e18743a636bcf2d1c83135c2e.tar.gz scummvm-rg350-4c1e8b3f453fec9e18743a636bcf2d1c83135c2e.tar.bz2 scummvm-rg350-4c1e8b3f453fec9e18743a636bcf2d1c83135c2e.zip | |
ZVISION: Allow CursorManager::revertToIdle to take _cursorIsPushed into account
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/zvision/cursor_manager.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/zvision/cursor_manager.cpp b/engines/zvision/cursor_manager.cpp index 361fe11714..0e7c2bc6cd 100644 --- a/engines/zvision/cursor_manager.cpp +++ b/engines/zvision/cursor_manager.cpp @@ -72,7 +72,7 @@ void CursorManager::changeCursor(const Common::String &cursorName, bool pushed) _cursorIsPushed = pushed; if (cursorName == "idle" && !pushed) { - revertToIdle(); + CursorMan.replaceCursor(_idleCursor.getSurface(), _idleCursor.getWidth(), _idleCursor.getHeight(), _idleCursor.getHotspotX(), _idleCursor.getHotspotY(), _idleCursor.getKeyColor(), false, _pixelFormat); return; } @@ -124,7 +124,10 @@ void CursorManager::cursorDown(bool pushed) { void CursorManager::revertToIdle() { _currentCursor = "idle"; - CursorMan.replaceCursor(_idleCursor.getSurface(), _idleCursor.getWidth(), _idleCursor.getHeight(), _idleCursor.getHotspotX(), _idleCursor.getHotspotY(), _idleCursor.getKeyColor(), false, _pixelFormat); + if (!_cursorIsPushed) + CursorMan.replaceCursor(_idleCursor.getSurface(), _idleCursor.getWidth(), _idleCursor.getHeight(), _idleCursor.getHotspotX(), _idleCursor.getHotspotY(), _idleCursor.getKeyColor(), false, _pixelFormat); + else + changeCursor(_currentCursor, _cursorIsPushed); } } // End of namespace ZVision |