aboutsummaryrefslogtreecommitdiff
path: root/kyra/screen.cpp
diff options
context:
space:
mode:
authorOystein Eftevaag2006-01-10 02:43:30 +0000
committerOystein Eftevaag2006-01-10 02:43:30 +0000
commit6946efeb7f87d104ba5416935032c01033b7b805 (patch)
treea0527974b9270d492ef76daf9d8422640c635255 /kyra/screen.cpp
parent713a646409fed4ff46c61f1cc6417b5fe8d3d8c9 (diff)
downloadscummvm-rg350-6946efeb7f87d104ba5416935032c01033b7b805.tar.gz
scummvm-rg350-6946efeb7f87d104ba5416935032c01033b7b805.tar.bz2
scummvm-rg350-6946efeb7f87d104ba5416935032c01033b7b805.zip
Fixed regression bug #1400707, and reenabled mouselocking with a fix,
to remove the mouse flickering under cutscenes and such. svn-id: r19962
Diffstat (limited to 'kyra/screen.cpp')
-rw-r--r--kyra/screen.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/kyra/screen.cpp b/kyra/screen.cpp
index 14f4bfb516..f4071c880b 100644
--- a/kyra/screen.cpp
+++ b/kyra/screen.cpp
@@ -1650,15 +1650,18 @@ int Screen::getRectSize(int x, int y) {
void Screen::hideMouse() {
debug(9, "Screen::hideMouse()");
- //++_mouseLockCount;
+ ++_mouseLockCount;
_system->showMouse(false);
}
void Screen::showMouse() {
debug(9, "Screen::showMouse()");
- //if (--_mouseLockCount == 0) {
+
+ if (_mouseLockCount > 0)
+ _mouseLockCount--;
+
+ if (_mouseLockCount == 0)
_system->showMouse(true);
- //}
}
void Screen::setShapePages(int page1, int page2) {