[Scummvm-git-logs] scummvm master -> 7cc2e00eca7f7d64659918f483021cd57e7b0976
dreammaster
dreammaster at scummvm.org
Sat Jan 28 04:25:03 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:
7cc2e00eca TITANIC: Properly initialize TTconcept fields on creation
Commit: 7cc2e00eca7f7d64659918f483021cd57e7b0976
https://github.com/scummvm/scummvm/commit/7cc2e00eca7f7d64659918f483021cd57e7b0976
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-27T22:24:56-05:00
Commit Message:
TITANIC: Properly initialize TTconcept fields on creation
Changed paths:
engines/titanic/true_talk/tt_concept.cpp
diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp
index b431331..b7ad0b3 100644
--- a/engines/titanic/true_talk/tt_concept.cpp
+++ b/engines/titanic/true_talk/tt_concept.cpp
@@ -53,7 +53,8 @@ TTconcept::TTconcept(TTscriptBase *script, ScriptType scriptType) :
TTconcept::TTconcept(TTword *word, ScriptType scriptType) :
_string1(" "), _string2(" "), _nextP(nullptr), _wordP(nullptr), _scriptP(nullptr),
- _status(SS_VALID), _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) {
+ _status(SS_VALID), _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field1C(0), _field20(0),
+ _field30(0), _field34(0), _flag(false) {
if (!word || !setStatus() || word->getStatus()) {
_status = SS_5;
} else {
@@ -68,8 +69,9 @@ TTconcept::TTconcept(TTword *word, ScriptType scriptType) :
TTconcept::TTconcept(TTconcept &src) :
_string1(src._string1), _string2(src._string2), _nextP(nullptr),
- _wordP(nullptr), _scriptP(nullptr), _status(SS_VALID),
- _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) {
+ _wordP(nullptr), _word2P(nullptr), _scriptP(nullptr), _status(SS_VALID),
+ _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field1C(0), _field20(0),
+ _field30(0), _field34(0), _flag(false) {
if (src.getStatus()) {
_status = SS_5;
} else {
More information about the Scummvm-git-logs
mailing list