aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2010-04-11 17:27:33 +0000
committerJohannes Schickel2010-04-11 17:27:33 +0000
commit175a81ce98d618b07cacd2b1298365d3aaa7a3c4 (patch)
tree6b3a2fc9df4702ecd6025d48fbf77ed4688aed6a /engines
parent29172d48447d1418783333b93677f9151fc424c4 (diff)
downloadscummvm-rg350-175a81ce98d618b07cacd2b1298365d3aaa7a3c4.tar.gz
scummvm-rg350-175a81ce98d618b07cacd2b1298365d3aaa7a3c4.tar.bz2
scummvm-rg350-175a81ce98d618b07cacd2b1298365d3aaa7a3c4.zip
Fix KYRA's cursor handling by pushing a dummy cursor via CursorMan.pushCursor too. Also replace CursorMan.popAllCursors by CursorMan.popCursor to prevent the caller's cursor from being destroyed.
svn-id: r48621
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/screen.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index cec6f1970a..0332e56e73 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -70,7 +70,7 @@ Screen::~Screen() {
for (uint i = 0; i < _palettes.size(); ++i)
delete _palettes[i];
- CursorMan.popAllCursors();
+ CursorMan.popCursor();
}
bool Screen::init() {
@@ -158,6 +158,7 @@ bool Screen::init() {
_animBlockPtr = NULL;
_animBlockSize = 0;
_mouseLockCount = 1;
+ CursorMan.pushCursor(NULL, 0, 0, 0, 0, 0);
CursorMan.showMouse(false);
_forceFullUpdate = false;