diff options
author | Paul Gilbert | 2016-05-22 08:09:48 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:14:11 -0400 |
commit | 82614fedf3c2b9380530fdc4bc68d585d31aaedb (patch) | |
tree | 0563b6f08cbb33fdb3316dd466eea70c1fe523b0 /engines/titanic/true_talk | |
parent | 6d2f65c97fd4cd23efd3e6e5e0087bf167744d89 (diff) | |
download | scummvm-rg350-82614fedf3c2b9380530fdc4bc68d585d31aaedb.tar.gz scummvm-rg350-82614fedf3c2b9380530fdc4bc68d585d31aaedb.tar.bz2 scummvm-rg350-82614fedf3c2b9380530fdc4bc68d585d31aaedb.zip |
TITANIC: Making TTword constructors and copy methods const
Diffstat (limited to 'engines/titanic/true_talk')
-rw-r--r-- | engines/titanic/true_talk/tt_action.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_action.h | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_adj.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_adj.h | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_major_word.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_major_word.h | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_picture.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_picture.h | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_pronoun.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_pronoun.h | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_word.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_word.h | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/engines/titanic/true_talk/tt_action.cpp b/engines/titanic/true_talk/tt_action.cpp index bb30e9c996..04135b550f 100644 --- a/engines/titanic/true_talk/tt_action.cpp +++ b/engines/titanic/true_talk/tt_action.cpp @@ -30,7 +30,7 @@ TTaction::TTaction(TTstring &str, WordClass wordClass, int val2, int val3, int v TTmajorWord(str, wordClass, val2, val3), _field30(val4) { } -TTaction::TTaction(TTaction *src) : TTmajorWord(src) { +TTaction::TTaction(const TTaction *src) : TTmajorWord(src) { if (src->getStatus()) { _field30 = 0; _status = SS_5; @@ -50,7 +50,7 @@ int TTaction::load(SimpleFile *file) { } } -TTword *TTaction::copy() { +TTword *TTaction::copy() const { TTaction *returnWordP = new TTaction(this); returnWordP->_status = _status; if (!_status) { diff --git a/engines/titanic/true_talk/tt_action.h b/engines/titanic/true_talk/tt_action.h index 0bd104977d..7b91b14743 100644 --- a/engines/titanic/true_talk/tt_action.h +++ b/engines/titanic/true_talk/tt_action.h @@ -34,7 +34,7 @@ protected: int _field30; public: TTaction(TTstring &str, WordClass wordClass, int val2, int val3, int val4); - TTaction(TTaction *src); + TTaction(const TTaction *src); /** * Load the word @@ -47,7 +47,7 @@ public: /** * Creates a copy of the word */ - virtual TTword *copy(); + virtual TTword *copy() const; virtual bool proc12(int val) const { return _field30 == val; } }; diff --git a/engines/titanic/true_talk/tt_adj.cpp b/engines/titanic/true_talk/tt_adj.cpp index 5659ed2276..1c16d5894c 100644 --- a/engines/titanic/true_talk/tt_adj.cpp +++ b/engines/titanic/true_talk/tt_adj.cpp @@ -36,7 +36,7 @@ TTadj::TTadj(TTstring &str, WordClass wordClass, int val2, int val3, int val4) : } } -TTadj::TTadj(TTadj *src) : TTmajorWord(src) { +TTadj::TTadj(const TTadj *src) : TTmajorWord(src) { if (src->getStatus()) { _field30 = 0; _status = SS_5; @@ -56,7 +56,7 @@ int TTadj::load(SimpleFile *file) { } } -TTword *TTadj::copy() { +TTword *TTadj::copy() const { TTadj *returnWordP = new TTadj(this); returnWordP->_status = _status; if (!_status) { diff --git a/engines/titanic/true_talk/tt_adj.h b/engines/titanic/true_talk/tt_adj.h index 7dab02d3d1..813cc8cfa0 100644 --- a/engines/titanic/true_talk/tt_adj.h +++ b/engines/titanic/true_talk/tt_adj.h @@ -34,7 +34,7 @@ protected: int _field30; public: TTadj(TTstring &str, WordClass wordClass, int val2, int val3, int val4); - TTadj(TTadj *src); + TTadj(const TTadj *src); /** * Load the word @@ -44,7 +44,7 @@ public: /** * Creates a copy of the word */ - virtual TTword *copy(); + virtual TTword *copy() const; virtual bool proc14(int val) const { return _field30 == val; } virtual int proc15() const { return _field30; } diff --git a/engines/titanic/true_talk/tt_major_word.cpp b/engines/titanic/true_talk/tt_major_word.cpp index 28b9434026..0085accceb 100644 --- a/engines/titanic/true_talk/tt_major_word.cpp +++ b/engines/titanic/true_talk/tt_major_word.cpp @@ -30,7 +30,7 @@ TTmajorWord::TTmajorWord(TTstring &str, WordClass wordClass, int val2, int val3) TTword(str, wordClass, val2), _field2C(val3) { } -TTmajorWord::TTmajorWord(TTmajorWord *src) : TTword(src) { +TTmajorWord::TTmajorWord(const TTmajorWord *src) : TTword(src) { if (src->getStatus()) { _field2C = 0; _status = SS_5; @@ -51,7 +51,7 @@ int TTmajorWord::saveData(SimpleFile *file, int val) const { return result; } -TTword *TTmajorWord::copy() { +TTword *TTmajorWord::copy() const { TTmajorWord *returnWordP = new TTmajorWord(this); returnWordP->_status = _status; if (!_status) { diff --git a/engines/titanic/true_talk/tt_major_word.h b/engines/titanic/true_talk/tt_major_word.h index 716ccf152f..d3d434e26d 100644 --- a/engines/titanic/true_talk/tt_major_word.h +++ b/engines/titanic/true_talk/tt_major_word.h @@ -39,12 +39,12 @@ protected: int saveData(SimpleFile *file, int val) const; public: TTmajorWord(TTstring &str, WordClass wordClass, int val2, int val3); - TTmajorWord(TTmajorWord *src); + TTmajorWord(const TTmajorWord *src); /** * Creates a copy of the word */ - virtual TTword *copy(); + virtual TTword *copy() const; virtual bool proc2(int val) const { return _field2C == val; } }; diff --git a/engines/titanic/true_talk/tt_picture.cpp b/engines/titanic/true_talk/tt_picture.cpp index 59ff6c746b..5c6444adb3 100644 --- a/engines/titanic/true_talk/tt_picture.cpp +++ b/engines/titanic/true_talk/tt_picture.cpp @@ -31,7 +31,7 @@ TTpicture::TTpicture(TTstring &str, WordClass wordClass, int val2, int val3, int _field38(0) { } -TTpicture::TTpicture(TTpicture *src) : TTmajorWord(src) { +TTpicture::TTpicture(const TTpicture *src) : TTmajorWord(src) { if (getStatus()) { _tag = 0; _field30 = 0; @@ -60,7 +60,7 @@ int TTpicture::load(SimpleFile *file) { } } -TTword *TTpicture::copy() { +TTword *TTpicture::copy() const { TTpicture *returnWordP = new TTpicture(this); returnWordP->_status = _status; if (!_status) { diff --git a/engines/titanic/true_talk/tt_picture.h b/engines/titanic/true_talk/tt_picture.h index 71beefe19c..9c7b2acfbf 100644 --- a/engines/titanic/true_talk/tt_picture.h +++ b/engines/titanic/true_talk/tt_picture.h @@ -37,7 +37,7 @@ protected: int _field3C; public: TTpicture(TTstring &str, WordClass wordClass, int val2, int val3, int val4, int val5, int val6); - TTpicture(TTpicture *src); + TTpicture(const TTpicture *src); /** * Load the word @@ -47,7 +47,7 @@ public: /** * Creates a copy of the word */ - virtual TTword *copy(); + virtual TTword *copy() const; /** * Checks whether the word's tag is a known type diff --git a/engines/titanic/true_talk/tt_pronoun.cpp b/engines/titanic/true_talk/tt_pronoun.cpp index 9b6692e60e..3ef48314e6 100644 --- a/engines/titanic/true_talk/tt_pronoun.cpp +++ b/engines/titanic/true_talk/tt_pronoun.cpp @@ -30,7 +30,7 @@ TTpronoun::TTpronoun(TTstring &str, WordClass wordClass, int val2, int val3, int TTmajorWord(str, wordClass, val2, val3), _field30(val4) { } -TTpronoun::TTpronoun(TTpronoun *src) : TTmajorWord(src) { +TTpronoun::TTpronoun(const TTpronoun *src) : TTmajorWord(src) { if (src->getStatus()) { _field30 = 0; _status = SS_5; @@ -54,7 +54,7 @@ int TTpronoun::load(SimpleFile *file) { } } -TTword *TTpronoun::copy() { +TTword *TTpronoun::copy() const { TTpronoun *returnWordP = new TTpronoun(this); returnWordP->_status = _status; if (!_status) { diff --git a/engines/titanic/true_talk/tt_pronoun.h b/engines/titanic/true_talk/tt_pronoun.h index 0d9466c29c..041ea1d5b8 100644 --- a/engines/titanic/true_talk/tt_pronoun.h +++ b/engines/titanic/true_talk/tt_pronoun.h @@ -34,7 +34,7 @@ protected: int _field30; public: TTpronoun(TTstring &str, WordClass wordClass, int val2, int val3, int val4); - TTpronoun(TTpronoun *src); + TTpronoun(const TTpronoun *src); /** * Load the word @@ -46,7 +46,7 @@ public: /** * Creates a copy of the word */ - virtual TTword *copy(); + virtual TTword *copy() const; virtual bool proc19(int val) const { return _field30 == val; } diff --git a/engines/titanic/true_talk/tt_word.cpp b/engines/titanic/true_talk/tt_word.cpp index c2ce2c1ef4..e799507d22 100644 --- a/engines/titanic/true_talk/tt_word.cpp +++ b/engines/titanic/true_talk/tt_word.cpp @@ -32,7 +32,7 @@ TTword::TTword(TTstring &str, WordClass wordClass, int id) : _string(str), _status = str.getStatus() == SS_VALID ? SS_VALID : SS_5; } -TTword::TTword(TTword *src) { +TTword::TTword(const TTword *src) { if (src->getStatus() != SS_VALID) { _status = SS_5; return; @@ -189,7 +189,7 @@ bool TTword::compareTo(const char *str) const { return _string == str; } -TTword *TTword::copy() { +TTword *TTword::copy() const { return new TTword(this); } diff --git a/engines/titanic/true_talk/tt_word.h b/engines/titanic/true_talk/tt_word.h index 5fa4953be7..f8239923d4 100644 --- a/engines/titanic/true_talk/tt_word.h +++ b/engines/titanic/true_talk/tt_word.h @@ -65,7 +65,7 @@ public: uint _tag; public: TTword(TTstring &str, WordClass wordClass, int val2); - TTword(TTword *src); + TTword(const TTword *src); ~TTword(); /** @@ -137,7 +137,7 @@ public: /** * Creates a copy of the word */ - virtual TTword *copy(); + virtual TTword *copy() const; void unkFn1(int val); |