[Scummvm-git-logs] scummvm master -> 588aaeac393293dd5c9a2b44f48ce6644416b96b

dreammaster dreammaster at scummvm.org
Sun Oct 23 23:54:01 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:
588aaeac39 TITANIC: Start Doorbot animating in closeup conversation


Commit: 588aaeac393293dd5c9a2b44f48ce6644416b96b
    https://github.com/scummvm/scummvm/commit/588aaeac393293dd5c9a2b44f48ce6644416b96b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-23T17:53:53-04:00

Commit Message:
TITANIC: Start Doorbot animating in closeup conversation

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



diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp
index ab0401a..9a8cd16 100644
--- a/engines/titanic/npcs/true_talk_npc.cpp
+++ b/engines/titanic/npcs/true_talk_npc.cpp
@@ -105,7 +105,7 @@ bool CTrueTalkNPC::TrueTalkNotifySpeechStartedMsg(CTrueTalkNotifySpeechStartedMs
 		_speechDuration = msg->_speechDuration;
 		_startTicks = getTicksCount();
 
-		if (hasActiveMovie() || (_npcFlags & NPCFLAG_2)) {
+		if (!hasActiveMovie() || (_npcFlags & NPCFLAG_2)) {
 			_npcFlags &= ~NPCFLAG_2;
 			stopMovie();
 





More information about the Scummvm-git-logs mailing list