[Scummvm-git-logs] scummvm master -> 11bb59a08f52a242dc39e36959a2ebfa48cb2a0b

[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:
11bb59a08f TITANIC: Fix NPC conversation crash


Commit: 11bb59a08f52a242dc39e36959a2ebfa48cb2a0b
    https://github.com/scummvm/scummvm/commit/11bb59a08f52a242dc39e36959a2ebfa48cb2a0b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-06T16:33:45-04:00

Commit Message:
TITANIC: Fix NPC conversation crash

Changed paths:
    engines/titanic/true_talk/tt_word.cpp


diff --git a/engines/titanic/true_talk/tt_word.cpp b/engines/titanic/true_talk/tt_word.cpp
index 01541de..5ed3e57 100644
--- a/engines/titanic/true_talk/tt_word.cpp
+++ b/engines/titanic/true_talk/tt_word.cpp
@@ -217,8 +217,9 @@ TTstringStatus TTword::getChainStatus() const {
 }
 
 TTword *TTword::copyWords() {
+	// Replicate the word and all following words it's linked to
 	TTword *result = copy();
-	for (TTword *word = result; word; word = word->_nextP)
+	for (TTword *word = result; word->_nextP; word = word->_nextP)
 		word->_nextP = word->_nextP->copy();
 
 	return result;