aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock
diff options
context:
space:
mode:
authorPaul Gilbert2015-04-29 21:24:34 -1000
committerPaul Gilbert2015-04-29 21:24:34 -1000
commitef4ec4cde3ec15d7370ef739e4fa6d863e7ccee5 (patch)
treefbba6c32f22c87547fd0f8bca21bc2d01808a992 /engines/sherlock
parente3881ccbb90cb7e650ba1e7d47e6c7dfe5133fdd (diff)
downloadscummvm-rg350-ef4ec4cde3ec15d7370ef739e4fa6d863e7ccee5.tar.gz
scummvm-rg350-ef4ec4cde3ec15d7370ef739e4fa6d863e7ccee5.tar.bz2
scummvm-rg350-ef4ec4cde3ec15d7370ef739e4fa6d863e7ccee5.zip
SHERLOCK: Fix moving crates in Tabacco Shop
Diffstat (limited to 'engines/sherlock')
-rw-r--r--engines/sherlock/user_interface.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/engines/sherlock/user_interface.cpp b/engines/sherlock/user_interface.cpp
index b12094638c..b0b0d15b5c 100644
--- a/engines/sherlock/user_interface.cpp
+++ b/engines/sherlock/user_interface.cpp
@@ -2592,16 +2592,22 @@ void UserInterface::checkAction(ActionType &action, const char *const messages[]
cAnimNum = 9;
else
cAnimNum = action._cAnimNum - 1;
- CAnim &anim = scene._cAnim[cAnimNum];
-
+
if (action._cAnimNum != 99) {
- if (action._cAnimSpeed & REVERSE_DIRECTION) {
- pt = anim._teleportPos;
- dir = anim._teleportDir;
- } else {
- pt = anim._goto;
- dir = anim._gotoDir;
+ CAnim &anim = scene._cAnim[cAnimNum];
+
+ if (action._cAnimNum != 99) {
+ if (action._cAnimSpeed & REVERSE_DIRECTION) {
+ pt = anim._teleportPos;
+ dir = anim._teleportDir;
+ } else {
+ pt = anim._goto;
+ dir = anim._gotoDir;
+ }
}
+ } else {
+ pt = Common::Point(-1, -1);
+ dir = -1;
}
if (action._cAnimSpeed) {