[Scummvm-git-logs] scummvm master -> 2640b8730a07db5c13b01d03cfbb13a351e208bb

[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:
2640b8730a TITANIC: Fix freeze in Doorbot conversation


Commit: 2640b8730a07db5c13b01d03cfbb13a351e208bb
    https://github.com/scummvm/scummvm/commit/2640b8730a07db5c13b01d03cfbb13a351e208bb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-23T22:04:41-04:00

Commit Message:
TITANIC: Fix freeze in Doorbot conversation

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



diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index a985c80..e5f18f6 100644
--- a/engines/titanic/npcs/doorbot.cpp
+++ b/engines/titanic/npcs/doorbot.cpp
@@ -121,7 +121,7 @@ bool CDoorbot::MovieEndMsg(CMovieEndMsg *msg) {
 			_npcFlags = (_npcFlags & ~NPCFLAG_8) | NPCFLAG_4;
 			endTalking(this, false);
 			startTalking(this, 221474);
-			_npcFlags &= ~NPCFLAG_8000000;
+			_npcFlags |= NPCFLAG_8000000;
 			_field108 = 0;
 		} else if (clipExistsByEnd("Cloak On", msg->_endFrame)) {
 			petShow();