[Scummvm-git-logs] scummvm master -> fc0396f80f655bc165fe6ce584e6301b6ada42d8

[dreammaster]

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:
fc0396f80f TITANIC: Fix freeze panning away from Parrot cage


Commit: fc0396f80f655bc165fe6ce584e6301b6ada42d8
    https://github.com/scummvm/scummvm/commit/fc0396f80f655bc165fe6ce584e6301b6ada42d8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-11T21:28:45-04:00

Commit Message:
TITANIC: Fix freeze panning away from Parrot cage

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


diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 6277751..9da3ed0 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");