[Scummvm-git-logs] scummvm master -> 84eef664a85bc0567c842d5098944ac830ace726
dreammaster
dreammaster at scummvm.org
Sun Oct 23 23:35:18 CEST 2016
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:
84eef664a8 TITANIC: Fix resetting NPC flags when Doorbot finishes speaking
Commit: 84eef664a85bc0567c842d5098944ac830ace726
https://github.com/scummvm/scummvm/commit/84eef664a85bc0567c842d5098944ac830ace726
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-23T17:35:12-04:00
Commit Message:
TITANIC: Fix resetting NPC flags when Doorbot finishes speaking
Changed paths:
engines/titanic/npcs/doorbot.cpp
diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index b9a4642..a985c80 100644
--- a/engines/titanic/npcs/doorbot.cpp
+++ b/engines/titanic/npcs/doorbot.cpp
@@ -402,6 +402,8 @@ bool CDoorbot::MovieFrameMsg(CMovieFrameMsg *msg) {
}
bool CDoorbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg) {
+ CTrueTalkNPC::TrueTalkNotifySpeechEndedMsg(msg);
+
if (_npcFlags & NPCFLAG_8000000) {
switch (msg->_dialogueId) {
case 10552:
More information about the Scummvm-git-logs
mailing list