From 66453dac06e9a3a815d2cf755fab610ed2c72071 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 16 Jan 2017 17:29:17 -0500
Subject: TITANIC: Fix locating vocab words in getPrimeWord

---
 engines/titanic/true_talk/tt_vocab.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp
index 6748d6535b..b37d30e65e 100644
--- a/engines/titanic/true_talk/tt_vocab.cpp
+++ b/engines/titanic/true_talk/tt_vocab.cpp
@@ -202,11 +202,12 @@ TTword *TTvocab::getPrimeWord(TTstring &str, TTword **srcWord) const {
 		newWord = new TTword(str, WC_ABSTRACT, 300);
 	} else {
 		// Standard word
-		for (vocabP = _headP; vocabP && !newWord; vocabP = vocabP->_nextP) {
+		for (vocabP = _headP; vocabP; vocabP = vocabP->_nextP) {
 			if (_vocabMode == 3 && !strcmp(str.c_str(), vocabP->c_str())) {
 				newWord = vocabP->copy();
 				newWord->_nextP = nullptr;
 				newWord->setSyn(nullptr);
+				break;
 			} else if (vocabP->findSynByName(str, &tempSyn, _vocabMode)) {
 				// Create a copy of the word and the found synonym
 				TTsynonym *newSyn = new TTsynonym(tempSyn);
@@ -214,6 +215,7 @@ TTword *TTvocab::getPrimeWord(TTstring &str, TTword **srcWord) const {
 				newWord = vocabP->copy();
 				newWord->_nextP = nullptr;
 				newWord->setSyn(newSyn);
+				break;
 			}
 		}
 	}
-- 
cgit v1.2.3