aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2009-05-17 23:42:54 +0000
committerJohannes Schickel2009-05-17 23:42:54 +0000
commitaa4964a46feb7d354ccc5fff67740a2834ea5e93 (patch)
tree6a28e50e44b46fda359aedd07e56354cdd3a70ed /engines/kyra
parent105f17374a2fa4155941c09972d414e479b50f00 (diff)
downloadscummvm-rg350-aa4964a46feb7d354ccc5fff67740a2834ea5e93.tar.gz
scummvm-rg350-aa4964a46feb7d354ccc5fff67740a2834ea5e93.tar.bz2
scummvm-rg350-aa4964a46feb7d354ccc5fff67740a2834ea5e93.zip
- Fix mouse cursor visibilty on load game in LoL
- Only show mouse cursor after cursor change, when the mouse was visible svn-id: r40669
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/saveload_lol.cpp5
-rw-r--r--engines/kyra/screen.cpp3
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp
index 73dc147c62..39003f4dc8 100644
--- a/engines/kyra/saveload_lol.cpp
+++ b/engines/kyra/saveload_lol.cpp
@@ -242,7 +242,10 @@ Common::Error LoLEngine::loadGameState(int slot) {
loadLevel(_currentLevel);
gui_drawPlayField();
timerSpecialCharacterUpdate(0);
- _unkFlag |= 0x800;
+ _unkFlag |= 0x800;
+
+ while (!_screen->isMouseVisible())
+ _screen->showMouse();
return Common::kNoError;
}
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 1e5e0839be..b834493baf 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -2609,7 +2609,8 @@ void Screen::setMouseCursor(int x, int y, const byte *shape) {
CursorMan.showMouse(false);
copyRegionToBuffer(8, xOffset, 0, mouseWidth, mouseHeight, cursor);
CursorMan.replaceCursor(cursor, mouseWidth, mouseHeight, x, y, 0);
- CursorMan.showMouse(true);
+ if (isMouseVisible())
+ CursorMan.showMouse(true);
delete[] cursor;
// makes sure that the cursor is drawn