aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorOystein Eftevaag2006-09-09 16:10:11 +0000
committerOystein Eftevaag2006-09-09 16:10:11 +0000
commit2db1dc882b4024fff417644035ed3eeff6f08e1b (patch)
treebc1623f94b6c3dbef1769ed5ef2e08dd69e5a698 /engines
parentab82dc3f9c18342eb4cd62d2a05c0845d2939eef (diff)
downloadscummvm-rg350-2db1dc882b4024fff417644035ed3eeff6f08e1b.tar.gz
scummvm-rg350-2db1dc882b4024fff417644035ed3eeff6f08e1b.tar.bz2
scummvm-rg350-2db1dc882b4024fff417644035ed3eeff6f08e1b.zip
Ignore mouselock count when switching the cursor graphics, fixing a bug salty-horse reported on irc.
svn-id: r23849
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/screen.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index d5cfb0265b..5d74e0e97b 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -1915,12 +1915,10 @@ void Screen::setMouseCursor(int x, int y, byte *shape) {
fillRect(0, 0, mouseWidth, mouseHeight, 0, 8);
drawShape(8, shape, 0, 0, 0, 0);
- if (!_mouseLockCount)
- CursorMan.showMouse(false);
+ CursorMan.showMouse(false);
copyRegionToBuffer(8, 0, 0, mouseWidth, mouseHeight, cursor);
CursorMan.replaceCursor(cursor, mouseWidth, mouseHeight, x, y, 0);
- if (!_mouseLockCount)
- CursorMan.showMouse(true);
+ CursorMan.showMouse(true);
free(cursor);
// makes sure that the cursor is drawn