diff options
author | Paul Gilbert | 2016-05-09 22:33:10 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-10 16:39:05 -0400 |
commit | a223309934452ca6652112060aac9bd7272d4ddb (patch) | |
tree | 364e0cd83d84280614d30d5871266bba544c7aa4 /engines | |
parent | 0f96471077d2c5a278fb1594e874e43029afff08 (diff) | |
download | scummvm-rg350-a223309934452ca6652112060aac9bd7272d4ddb.tar.gz scummvm-rg350-a223309934452ca6652112060aac9bd7272d4ddb.tar.bz2 scummvm-rg350-a223309934452ca6652112060aac9bd7272d4ddb.zip |
TITANIC: Changed casing on TTword classes to exactly match original
Diffstat (limited to 'engines')
-rw-r--r-- | engines/titanic/true_talk/st_vocab.cpp | 12 | ||||
-rw-r--r-- | engines/titanic/true_talk/st_vocab.h | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_word.cpp | 44 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_word.h | 24 |
4 files changed, 41 insertions, 41 deletions
diff --git a/engines/titanic/true_talk/st_vocab.cpp b/engines/titanic/true_talk/st_vocab.cpp index ff45dff592..1b03474292 100644 --- a/engines/titanic/true_talk/st_vocab.cpp +++ b/engines/titanic/true_talk/st_vocab.cpp @@ -50,14 +50,14 @@ int STVocab::load(const CString &name) { } case 1: { - TTWord2 *word = new TTWord2(space, 0, 0, 0, 0); + TTword2 *word = new TTword2(space, 0, 0, 0, 0); result = word->load(file); _word = word; break; } case 2: { - TTWord3 *word = new TTWord3(space, 0, 0, 0, 0, 0, 0); + TTword3 *word = new TTword3(space, 0, 0, 0, 0, 0, 0); result = word->load(file); _word = word; break; @@ -65,7 +65,7 @@ int STVocab::load(const CString &name) { case 3: case 9: { - TTWord1 *word = new TTWord1(space, 0, 0, 0); + TTword1 *word = new TTword1(space, 0, 0, 0); result = word->load(file, mode); _word = word; break; @@ -74,21 +74,21 @@ int STVocab::load(const CString &name) { case 4: case 5: case 7: { - TTWord *word = new TTWord(space, 0, 0); + TTword *word = new TTword(space, 0, 0); result = word->load(file, mode); _word = word; break; } case 8: { - TTWord4 *word = new TTWord4(space, 0, 0, 0, 0); + TTword4 *word = new TTword4(space, 0, 0, 0, 0); result = word->load(file); _word = word; break; } case 6: { - TTWord5 *word = new TTWord5(space, 0, 0, 0, 0); + TTword5 *word = new TTword5(space, 0, 0, 0, 0); result = word->load(file); _word = word; break; diff --git a/engines/titanic/true_talk/st_vocab.h b/engines/titanic/true_talk/st_vocab.h index cc25150981..c44c4ddda0 100644 --- a/engines/titanic/true_talk/st_vocab.h +++ b/engines/titanic/true_talk/st_vocab.h @@ -33,7 +33,7 @@ class STVocab { private: int _field0; int _field4; - TTWord *_word; + TTword *_word; int _fieldC; int _field10; int _field14; diff --git a/engines/titanic/true_talk/tt_word.cpp b/engines/titanic/true_talk/tt_word.cpp index 7d7cb2d0c2..62f924af6e 100644 --- a/engines/titanic/true_talk/tt_word.cpp +++ b/engines/titanic/true_talk/tt_word.cpp @@ -24,17 +24,17 @@ namespace Titanic { -TTWord::TTWord(TTString &str, int mode, int val2) : _string(str), +TTword::TTword(TTString &str, int mode, int val2) : _string(str), _wordMode(mode), _field1C(val2), _fieldC(0), _field10(0), _field20(0), _field24(0), _field28(0) { _status = str.getStatus() == SS_VALID ? SS_VALID : SS_5; } -int TTWord::readSyn(SimpleFile *file) { +int TTword::readSyn(SimpleFile *file) { return 0; } -int TTWord::load(SimpleFile *file, int mode) { +int TTword::load(SimpleFile *file, int mode) { CString str1, str2; int val; @@ -49,7 +49,7 @@ int TTWord::load(SimpleFile *file, int mode) { } } -uint TTWord::readNumber(const char *str) { +uint TTword::readNumber(const char *str) { uint numValue = *str; if (*str == '0') { numValue = MKTAG('Z', 'Z', 'Z', '['); @@ -64,20 +64,20 @@ uint TTWord::readNumber(const char *str) { /*------------------------------------------------------------------------*/ -TTWord1::TTWord1(TTString &str, int val1, int val2, int val3) : - TTWord(str, val1, val2), _field2C(val3) { +TTword1::TTword1(TTString &str, int val1, int val2, int val3) : + TTword(str, val1, val2), _field2C(val3) { } /*------------------------------------------------------------------------*/ -TTWord2::TTWord2(TTString &str, int val1, int val2, int val3, int val4) : - TTWord1(str, val1, val2, val3), _field30(val4) { +TTword2::TTword2(TTString &str, int val1, int val2, int val3, int val4) : + TTword1(str, val1, val2, val3), _field30(val4) { } -int TTWord2::load(SimpleFile *file) { +int TTword2::load(SimpleFile *file) { int val; - if (TTWord::load(file, 1) && file->scanf("%d", &val)) { + if (TTword::load(file, 1) && file->scanf("%d", &val)) { _field30 = val; return 0; } else { @@ -87,16 +87,16 @@ int TTWord2::load(SimpleFile *file) { /*------------------------------------------------------------------------*/ -TTWord3::TTWord3(TTString &str, int val1, int val2, int val3, int val4, int val5, int val6) : - TTWord1(str, val1, val2, val4), _field34(val3), _field30(val5), _field3C(val6), +TTword3::TTword3(TTString &str, int val1, int val2, int val3, int val4, int val5, int val6) : + TTword1(str, val1, val2, val4), _field34(val3), _field30(val5), _field3C(val6), _field38(0) { } -int TTWord3::load(SimpleFile *file) { +int TTword3::load(SimpleFile *file) { CString str; int val1, val2; - if (!TTWord::load(file, 2) && file->scanf("%d %d %d", &str, &val1, &val2)) { + if (!TTword::load(file, 2) && file->scanf("%d %d %d", &str, &val1, &val2)) { _field34 = readNumber(str.c_str()); _field30 = val1; _field3C = val2; @@ -108,8 +108,8 @@ int TTWord3::load(SimpleFile *file) { /*------------------------------------------------------------------------*/ -TTWord4::TTWord4(TTString &str, int val1, int val2, int val3, int val4) : - TTWord1(str, val1, val2, val3) { +TTword4::TTword4(TTString &str, int val1, int val2, int val3, int val4) : + TTword1(str, val1, val2, val3) { if (val4 >= 0 && val4 <= 9) { _field30 = val4; } else { @@ -118,10 +118,10 @@ TTWord4::TTWord4(TTString &str, int val1, int val2, int val3, int val4) : } } -int TTWord4::load(SimpleFile *file) { +int TTword4::load(SimpleFile *file) { int val; - if (TTWord::load(file, 1) && file->scanf("%d", &val)) { + if (TTword::load(file, 1) && file->scanf("%d", &val)) { _field30 = val; return 0; } else { @@ -131,14 +131,14 @@ int TTWord4::load(SimpleFile *file) { /*------------------------------------------------------------------------*/ -TTWord5::TTWord5(TTString &str, int val1, int val2, int val3, int val4) : - TTWord1(str, val1, val2, val3), _field30(val4) { +TTword5::TTword5(TTString &str, int val1, int val2, int val3, int val4) : + TTword1(str, val1, val2, val3), _field30(val4) { } -int TTWord5::load(SimpleFile *file) { +int TTword5::load(SimpleFile *file) { int val; - if (TTWord::load(file, 1) && file->scanf("%d", &val)) { + if (TTword::load(file, 1) && file->scanf("%d", &val)) { if (val >= 0 && val <= 12) { _field30 = val; return 0; diff --git a/engines/titanic/true_talk/tt_word.h b/engines/titanic/true_talk/tt_word.h index 7018d6e7e6..a24099c2ab 100644 --- a/engines/titanic/true_talk/tt_word.h +++ b/engines/titanic/true_talk/tt_word.h @@ -28,7 +28,7 @@ namespace Titanic { -class TTWord { +class TTword { protected: TTString _string; int _fieldC; @@ -45,7 +45,7 @@ protected: */ uint readNumber(const char *str); public: - TTWord(TTString &str, int mode, int val2); + TTword(TTString &str, int mode, int val2); int readSyn(SimpleFile *file); @@ -55,18 +55,18 @@ public: int load(SimpleFile *file, int mode); }; -class TTWord1 : public TTWord { +class TTword1 : public TTword { protected: int _field2C; public: - TTWord1(TTString &str, int val1, int val2, int val3); + TTword1(TTString &str, int val1, int val2, int val3); }; -class TTWord2 : public TTWord1 { +class TTword2 : public TTword1 { protected: int _field30; public: - TTWord2(TTString &str, int val1, int val2, int val3, int val4); + TTword2(TTString &str, int val1, int val2, int val3, int val4); /** * Load the word @@ -74,14 +74,14 @@ public: int load(SimpleFile *file); }; -class TTWord3 : public TTWord1 { +class TTword3 : public TTword1 { protected: int _field30; int _field34; int _field38; int _field3C; public: - TTWord3(TTString &str, int val1, int val2, int val3, int val4, int val5, int val6); + TTword3(TTString &str, int val1, int val2, int val3, int val4, int val5, int val6); /** * Load the word @@ -89,11 +89,11 @@ public: int load(SimpleFile *file); }; -class TTWord4 : public TTWord1 { +class TTword4 : public TTword1 { protected: int _field30; public: - TTWord4(TTString &str, int val1, int val2, int val3, int val4); + TTword4(TTString &str, int val1, int val2, int val3, int val4); /** * Load the word @@ -101,11 +101,11 @@ public: int load(SimpleFile *file); }; -class TTWord5 : public TTWord1 { +class TTword5 : public TTword1 { protected: int _field30; public: - TTWord5(TTString &str, int val1, int val2, int val3, int val4); + TTword5(TTString &str, int val1, int val2, int val3, int val4); /** * Load the word |