diff options
| author | Paul Gilbert | 2016-05-29 09:03:31 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-15 19:16:54 -0400 |
| commit | d0301bce6f932b34810110796fa86bc367ddf89f (patch) | |
| tree | 3044c0ba9fe8140168b15c7da19fb1fafede747b /engines/titanic/true_talk/tt_vocab.cpp | |
| parent | 703bb288c17e207f083e75facc750f5c8c30a09e (diff) | |
| download | scummvm-rg350-d0301bce6f932b34810110796fa86bc367ddf89f.tar.gz scummvm-rg350-d0301bce6f932b34810110796fa86bc367ddf89f.tar.bz2 scummvm-rg350-d0301bce6f932b34810110796fa86bc367ddf89f.zip | |
TITANIC: Move unknown method from TTword to TTadj
Diffstat (limited to 'engines/titanic/true_talk/tt_vocab.cpp')
| -rw-r--r-- | engines/titanic/true_talk/tt_vocab.cpp | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp index 350fc71d35..08d6e9e1a7 100644 --- a/engines/titanic/true_talk/tt_vocab.cpp +++ b/engines/titanic/true_talk/tt_vocab.cpp @@ -311,16 +311,17 @@ TTword *TTvocab::getSuffixedWord(TTstring &str) const { if (word) {
if (word->_wordClass == WC_ADJECTIVE) {
+ TTadj *adj = static_cast<TTadj *>(word);
int val1 = word->proc15();
int val2 = word->proc15();
if (val2 < 5) {
if (--val1 > 0) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
} else {
if (++val1 < 11) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
}
}
@@ -330,16 +331,17 @@ TTword *TTvocab::getSuffixedWord(TTstring &str) const { if (word) {
if (word->_wordClass == WC_ADJECTIVE) {
+ TTadj *adj = static_cast<TTadj *>(word);
int val1 = word->proc15();
int val2 = word->proc15();
if (val2 < 5) {
if (--val1 > 0) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
} else {
if (++val1 < 11) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
}
}
@@ -348,16 +350,17 @@ TTword *TTvocab::getSuffixedWord(TTstring &str) const { word = getPrimeWord(tempStr);
if (word && word->_wordClass == WC_ADJECTIVE) {
+ TTadj *adj = static_cast<TTadj *>(word);
int val1 = word->proc15();
int val2 = word->proc15();
if (val2 < 5) {
if (--val1 > 0) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
} else {
if (++val1 < 11) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
}
}
@@ -370,16 +373,17 @@ TTword *TTvocab::getSuffixedWord(TTstring &str) const { if (word) {
if (word->_wordClass == WC_ADJECTIVE) {
+ TTadj *adj = static_cast<TTadj *>(word);
int val1 = word->proc15();
int val2 = word->proc15();
if (val2 < 5) {
if (--val1 > 0) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
} else {
if (++val1 < 11) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
}
}
@@ -389,16 +393,17 @@ TTword *TTvocab::getSuffixedWord(TTstring &str) const { if (word) {
if (word->_wordClass == WC_ADJECTIVE) {
+ TTadj *adj = static_cast<TTadj *>(word);
int val1 = word->proc15();
int val2 = word->proc15();
if (val2 < 5) {
if (--val1 > 0) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
} else {
if (++val1 < 11) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
}
}
@@ -407,16 +412,17 @@ TTword *TTvocab::getSuffixedWord(TTstring &str) const { word = getPrimeWord(tempStr);
if (word) {
+ TTadj *adj = static_cast<TTadj *>(word);
int val1 = word->proc15();
int val2 = word->proc15();
if (val2 < 5) {
if (--val1 > 0) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
} else {
if (++val1 < 11) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
}
}
@@ -522,15 +528,16 @@ TTword *TTvocab::getPrefixedWord(TTstring &str) const { if (!word)
tempStr = str;
- else if (word->_wordClass == 8) {
+ else if (word->_wordClass == WC_ADJECTIVE) {
+ TTadj *adj = static_cast<TTadj *>(word);
int val1 = word->proc15();
int val2 = word->proc15();
if (val2 < 5) {
if (--val1 > 0)
- word->unkFn1(val1);
+ adj->adjFn1(val1);
} else if (++val1 < 11) {
- word->unkFn1(val1);
+ adj->adjFn1(val1);
}
}
}
|