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

[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:
e685973cac TITANIC: Fix bots freezing up during long conversations


Commit: e685973cac056f8df0b4b02ed7bd143e05767a0c
    https://github.com/scummvm/scummvm/commit/e685973cac056f8df0b4b02ed7bd143e05767a0c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-07T20:40:31-04:00

Commit Message:
TITANIC: Fix bots freezing up during long conversations

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 d5619ec..c1b1795 100644
--- a/engines/titanic/npcs/true_talk_npc.cpp
+++ b/engines/titanic/npcs/true_talk_npc.cpp
@@ -156,7 +156,7 @@ bool CTrueTalkNPC::MovieEndMsg(CMovieEndMsg *msg) {
 
 	int diff = getTicksCount() - _startTicks;
 	int ticks = MAX((int)_speechDuration - diff, 0);
-	CNPCPlayTalkingAnimationMsg msg1(ticks, ticks > 1000 ? 2 : 1, 0);
+	CNPCPlayTalkingAnimationMsg msg1(ticks, ticks > 1000 ? 1 : 2, 0);
 	msg1.execute(this);
 
 	if (msg1._names) {