aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-10 22:09:04 -0500
committerPaul Gilbert2017-01-10 22:09:04 -0500
commit79377265811c2f26cef30e8336a17f0f8287dde1 (patch)
treed05aa14b644b1e912117b5fe4dd6ef65c221e1e4 /engines/titanic
parent12032bb51860c203b817334648452a08f635d118 (diff)
downloadscummvm-rg350-79377265811c2f26cef30e8336a17f0f8287dde1.tar.gz
scummvm-rg350-79377265811c2f26cef30e8336a17f0f8287dde1.tar.bz2
scummvm-rg350-79377265811c2f26cef30e8336a17f0f8287dde1.zip
TITANIC: Remove duplicated fields from TTsynonym
Diffstat (limited to 'engines/titanic')
-rw-r--r--engines/titanic/true_talk/tt_string_node.cpp3
-rw-r--r--engines/titanic/true_talk/tt_synonym.cpp8
-rw-r--r--engines/titanic/true_talk/tt_synonym.h5
3 files changed, 5 insertions, 11 deletions
diff --git a/engines/titanic/true_talk/tt_string_node.cpp b/engines/titanic/true_talk/tt_string_node.cpp
index 5a21d73a9b..60c506e8cd 100644
--- a/engines/titanic/true_talk/tt_string_node.cpp
+++ b/engines/titanic/true_talk/tt_string_node.cpp
@@ -25,7 +25,8 @@
namespace Titanic {
-TTstringNode::TTstringNode() : TTnode() {
+TTstringNode::TTstringNode() : TTnode(), _file(HANDLE_STDIN),
+ _mode(0), _field1C(0) {
}
void TTstringNode::initialize(int mode) {
diff --git a/engines/titanic/true_talk/tt_synonym.cpp b/engines/titanic/true_talk/tt_synonym.cpp
index bb78e734ca..4629351f12 100644
--- a/engines/titanic/true_talk/tt_synonym.cpp
+++ b/engines/titanic/true_talk/tt_synonym.cpp
@@ -24,19 +24,17 @@
namespace Titanic {
-TTsynonym::TTsynonym() : TTstringNode(), _file(HANDLE_STDIN),
- _mode(0), _field1C(0) {
+TTsynonym::TTsynonym() : TTstringNode() {
}
-TTsynonym::TTsynonym(const TTsynonym *src) : TTstringNode(),
- _mode(0), _field1C(0) {
+TTsynonym::TTsynonym(const TTsynonym *src) : TTstringNode() {
_string = src->_string;
initialize(src->_mode);
_file = src->_file;
}
TTsynonym::TTsynonym(int mode, const char *str, FileHandle file) :
- TTstringNode(), _mode(0), _field1C(0) {
+ TTstringNode() {
_string = str;
initialize(mode);
_file = file;
diff --git a/engines/titanic/true_talk/tt_synonym.h b/engines/titanic/true_talk/tt_synonym.h
index d5dc2be09e..09f4617cf1 100644
--- a/engines/titanic/true_talk/tt_synonym.h
+++ b/engines/titanic/true_talk/tt_synonym.h
@@ -30,11 +30,6 @@ namespace Titanic {
class TTsynonym : public TTstringNode {
public:
- TTstring _string;
- FileHandle _file;
- int _mode;
- int _field1C;
-public:
TTsynonym();
TTsynonym(const TTsynonym *src);
TTsynonym(int mode, const char *str, FileHandle file);