aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/npcs
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-20 23:30:39 -0500
committerPaul Gilbert2017-01-20 23:30:39 -0500
commit9413afc2baa07732285d04e1169105b3065ff737 (patch)
tree35782eef38209096c12a8d4c39018750ae952f12 /engines/titanic/npcs
parentab1e729d2ceb9f207be051d720d66f3ca03fc2ea (diff)
downloadscummvm-rg350-9413afc2baa07732285d04e1169105b3065ff737.tar.gz
scummvm-rg350-9413afc2baa07732285d04e1169105b3065ff737.tar.bz2
scummvm-rg350-9413afc2baa07732285d04e1169105b3065ff737.zip
TITANIC: Fix aborting parrot eating chicken
Diffstat (limited to 'engines/titanic/npcs')
-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 bfb6690107..a377e8a3b0 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -606,9 +606,12 @@ bool CParrot::FrameMsg(CFrameMsg *msg) {
if (_npcFlags & NPCFLAG_CHICKEN_OUTSIDE_CAGE) {
if (!chickenFlag || pt.x > 70 || pt.y < 90 || pt.y > 280) {
+ // A start of eating the chicken outside the cage has to be
+ // aborted because the chicken has been moved out of range
stopMovie();
loadFrame(0);
setPosition(Point(-90, _bounds.top));
+ _npcFlags &= ~NPCFLAG_CHICKEN_OUTSIDE_CAGE;
}
} else {
if (!chickenFlag)