[Scummvm-git-logs] scummvm master -> 9413afc2baa07732285d04e1169105b3065ff737

dreammaster dreammaster at scummvm.org
Sat Jan 21 05:30:45 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9413afc2ba TITANIC: Fix aborting parrot eating chicken


Commit: 9413afc2baa07732285d04e1169105b3065ff737
    https://github.com/scummvm/scummvm/commit/9413afc2baa07732285d04e1169105b3065ff737
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-20T23:30:39-05:00

Commit Message:
TITANIC: Fix aborting parrot eating chicken

Changed paths:
    engines/titanic/npcs/parrot.cpp


diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index bfb6690..a377e8a 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)





More information about the Scummvm-git-logs mailing list