diff options
| author | Paul Gilbert | 2016-05-19 22:54:49 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:13:28 -0400 |
| commit | bb459dd5a8219e9f096c8ea52372f07484c2bf19 (patch) | |
| tree | 9a0019e667d87a066b53e93b2abccb9d19b0cb96 /engines/titanic/true_talk | |
| parent | c4084e731b60b97bbe0cdf5d6f61f1894b70f96c (diff) | |
| download | scummvm-rg350-bb459dd5a8219e9f096c8ea52372f07484c2bf19.tar.gz scummvm-rg350-bb459dd5a8219e9f096c8ea52372f07484c2bf19.tar.bz2 scummvm-rg350-bb459dd5a8219e9f096c8ea52372f07484c2bf19.zip | |
TITANIC: Changed setSynStr parameter type
Diffstat (limited to 'engines/titanic/true_talk')
| -rw-r--r-- | engines/titanic/true_talk/tt_vocab.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/true_talk/tt_word.cpp | 6 | ||||
| -rw-r--r-- | engines/titanic/true_talk/tt_word.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp index 2e5a7cc794..66497a5ada 100644 --- a/engines/titanic/true_talk/tt_vocab.cpp +++ b/engines/titanic/true_talk/tt_vocab.cpp @@ -476,7 +476,7 @@ TTword *TTvocab::getSuffixedWord(TTstring &str) const { }
if (word)
- word->setSynStr(&str);
+ word->setSynStr(str);
return word;
}
@@ -538,7 +538,7 @@ TTword *TTvocab::getPrefixedWord(TTstring &str) const { if (word) {
// Set the original word on either the found word or synonym
if (word->hasSynonyms())
- word->setSynStr(&str);
+ word->setSynStr(str);
else
word->_string = str;
}
diff --git a/engines/titanic/true_talk/tt_word.cpp b/engines/titanic/true_talk/tt_word.cpp index eebb161167..bb9d63d691 100644 --- a/engines/titanic/true_talk/tt_word.cpp +++ b/engines/titanic/true_talk/tt_word.cpp @@ -116,11 +116,11 @@ void TTword::setSyn(TTsynonym *synP) { _synP = synP; } -int TTword::setSynStr(TTstring *str) { - if (str->empty()) +int TTword::setSynStr(TTstring &str) { + if (str.empty()) return 4; - TTstring *newStr = new TTstring(*str); + TTstring *newStr = new TTstring(str); TTsynonym *newSyn = new TTsynonym(4, newStr); setSyn(newSyn); return 0; diff --git a/engines/titanic/true_talk/tt_word.h b/engines/titanic/true_talk/tt_word.h index 0823e3d2a8..01482a97ea 100644 --- a/engines/titanic/true_talk/tt_word.h +++ b/engines/titanic/true_talk/tt_word.h @@ -77,7 +77,7 @@ public: /** * Set a new synonym string */ - int setSynStr(TTstring *str); + int setSynStr(TTstring &str); /** * Returns true if synonyms have been set for the word |