diff options
| author | Paul Gilbert | 2017-01-16 17:29:17 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-16 17:29:17 -0500 |
| commit | 66453dac06e9a3a815d2cf755fab610ed2c72071 (patch) | |
| tree | 07afc582e7f00b4befe205d746c06ef2bbdd5cae | |
| parent | aef95a6964613adc6d5956ef01477880ff3e8a9a (diff) | |
| download | scummvm-rg350-66453dac06e9a3a815d2cf755fab610ed2c72071.tar.gz scummvm-rg350-66453dac06e9a3a815d2cf755fab610ed2c72071.tar.bz2 scummvm-rg350-66453dac06e9a3a815d2cf755fab610ed2c72071.zip | |
TITANIC: Fix locating vocab words in getPrimeWord
| -rw-r--r-- | engines/titanic/true_talk/tt_vocab.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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;
}
}
}
|