aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorPaul Gilbert2017-09-11 21:28:45 -0400
committerPaul Gilbert2017-09-11 21:28:45 -0400
commitfc0396f80f655bc165fe6ce584e6301b6ada42d8 (patch)
tree9023086bdc46eb9a43d7aee9e01a449e996b6ed0 /engines/titanic
parentc8c83145a8dc90c8ea340b258999e32db56e40a0 (diff)
downloadscummvm-rg350-fc0396f80f655bc165fe6ce584e6301b6ada42d8.tar.gz
scummvm-rg350-fc0396f80f655bc165fe6ce584e6301b6ada42d8.tar.bz2
scummvm-rg350-fc0396f80f655bc165fe6ce584e6301b6ada42d8.zip
TITANIC: Fix freeze panning away from Parrot cage
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/npcs/parrot.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 6277751efd..9da3ed0a32 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -548,6 +548,9 @@ bool CParrot::FrameMsg(CFrameMsg *msg) {
| NPCFLAG_MOVE_FINISH | NPCFLAG_MOVE_LEFT | NPCFLAG_MOVE_RIGHT | NPCFLAG_MOVE_END);
return true;
}
+
+ // WORKAROUND: Prevent panning away from stalling if Parrot was moving
+ _npcFlags &= ~NPCFLAG_MOVING;
} else {
if (dragObject)
chickenFlag = dragObject && dragObject->isEquals("Chicken");