aboutsummaryrefslogtreecommitdiff
path: root/engines/toon
diff options
context:
space:
mode:
authorSylvain Dupont2010-10-26 22:26:13 +0000
committerSylvain Dupont2010-10-26 22:26:13 +0000
commitfc1e70eb01007e89a66ca9d9313f7e1b1ffc1e0b (patch)
tree5e603aba787a2eaf650278d4645b45311006654f /engines/toon
parent66da19552ea855d825c6a68b00e3e5ea8b84d932 (diff)
downloadscummvm-rg350-fc1e70eb01007e89a66ca9d9313f7e1b1ffc1e0b.tar.gz
scummvm-rg350-fc1e70eb01007e89a66ca9d9313f7e1b1ffc1e0b.tar.bz2
scummvm-rg350-fc1e70eb01007e89a66ca9d9313f7e1b1ffc1e0b.zip
TOON: Fix SetMousePos wrong position
When the game was in a close up, cmd_Set_Mouse_Pos was setting a out-of-window mouse position. svn-id: r53866
Diffstat (limited to 'engines/toon')
-rw-r--r--engines/toon/script_func.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp
index f96b9567a9..f571f324ef 100644
--- a/engines/toon/script_func.cpp
+++ b/engines/toon/script_func.cpp
@@ -548,7 +548,11 @@ int32 ScriptFunc::sys_Cmd_Exit_Conversation(EMCState *state) {
}
int32 ScriptFunc::sys_Cmd_Set_Mouse_Pos(EMCState *state) {
- _vm->getSystem()->warpMouse(stackPos(0) - _vm->state()->_currentScrollValue, stackPos(1));
+ if (_vm->state()->_inCloseUp) {
+ _vm->getSystem()->warpMouse(stackPos(0), stackPos(1));
+ } else {
+ _vm->getSystem()->warpMouse(stackPos(0) - _vm->state()->_currentScrollValue, stackPos(1));
+ }
return 0;
}