aboutsummaryrefslogtreecommitdiff
path: root/sky/sky.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2003-07-12 01:12:00 +0000
committerRobert Göffringmann2003-07-12 01:12:00 +0000
commita857771521346eb29c5d2aa27e997f8f3ec058c8 (patch)
tree7ab3610149cd8893419eabc37388ea84c192a51e /sky/sky.cpp
parent9c531b56090a094d5fb44aa1ad43478ff4f06097 (diff)
downloadscummvm-rg350-a857771521346eb29c5d2aa27e997f8f3ec058c8.tar.gz
scummvm-rg350-a857771521346eb29c5d2aa27e997f8f3ec058c8.tar.bz2
scummvm-rg350-a857771521346eb29c5d2aa27e997f8f3ec058c8.zip
implemented dialog skipping and cleaned up mouse code
svn-id: r8919
Diffstat (limited to 'sky/sky.cpp')
-rw-r--r--sky/sky.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp
index e36076a41e..c0307782a2 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -359,9 +359,11 @@ void SkyState::delay(uint amount) { //copied and mutilated from Simon.cpp
break;
case OSystem::EVENT_MOUSEMOVE:
- _sdl_mouse_x = event.mouse.x;
- _sdl_mouse_y = event.mouse.y;
- _system->set_mouse_pos(_sdl_mouse_x, _sdl_mouse_y);
+ if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) {
+ _sdl_mouse_x = event.mouse.x;
+ _sdl_mouse_y = event.mouse.y;
+ _system->set_mouse_pos(_sdl_mouse_x, _sdl_mouse_y);
+ }
break;
case OSystem::EVENT_LBUTTONDOWN: