[Scummvm-git-logs] scummvm master -> 79377265811c2f26cef30e8336a17f0f8287dde1

dreammaster dreammaster at scummvm.org
Wed Jan 11 04:09:11 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7937726581 TITANIC: Remove duplicated fields from TTsynonym


Commit: 79377265811c2f26cef30e8336a17f0f8287dde1
    https://github.com/scummvm/scummvm/commit/79377265811c2f26cef30e8336a17f0f8287dde1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-10T22:09:04-05:00

Commit Message:
TITANIC: Remove duplicated fields from TTsynonym

Changed paths:
    engines/titanic/true_talk/tt_string_node.cpp
    engines/titanic/true_talk/tt_synonym.cpp
    engines/titanic/true_talk/tt_synonym.h


diff --git a/engines/titanic/true_talk/tt_string_node.cpp b/engines/titanic/true_talk/tt_string_node.cpp
index 5a21d73..60c506e 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 bb78e73..4629351 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 d5dc2be..09f4617 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);





More information about the Scummvm-git-logs mailing list