diff options
| author | Paul Gilbert | 2016-12-15 23:12:29 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-15 23:12:29 -0500 |
| commit | dc58af2749a0638a1d060ae87ef17266d583f217 (patch) | |
| tree | 05fa4252d9c9ac999d5863bd5ca27c81935ff4d0 | |
| parent | 8777868c2842bb0fe5a3475695b730c1e1292e43 (diff) | |
| download | scummvm-rg350-dc58af2749a0638a1d060ae87ef17266d583f217.tar.gz scummvm-rg350-dc58af2749a0638a1d060ae87ef17266d583f217.tar.bz2 scummvm-rg350-dc58af2749a0638a1d060ae87ef17266d583f217.zip | |
TITANIC: Extra initialization of TTconcept fields
| -rw-r--r-- | engines/titanic/true_talk/tt_concept.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp index cd24d7cc36..5d538606e4 100644 --- a/engines/titanic/true_talk/tt_concept.cpp +++ b/engines/titanic/true_talk/tt_concept.cpp @@ -28,7 +28,8 @@ namespace Titanic { TTconcept::TTconcept() : _string1(" "), _string2(" "), - _scriptP(nullptr), _wordP(nullptr), _status(SS_VALID) { + _nextP(nullptr), _scriptP(nullptr), _wordP(nullptr), _status(SS_VALID), + _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) { if (setStatus()) setScriptType(ST_UNKNOWN_SCRIPT); else @@ -36,8 +37,8 @@ TTconcept::TTconcept() : _string1(" "), _string2(" "), } TTconcept::TTconcept(TTscriptBase *script, ScriptType scriptType) : - _string1(" "), _string2(" "), _wordP(nullptr), _scriptP(nullptr), - _status(SS_VALID) { + _string1(" "), _string2(" "), _nextP(nullptr), _wordP(nullptr), _scriptP(nullptr), + _status(SS_VALID), _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) { if (!script->getStatus()) { setScriptType(scriptType); _scriptP = script; @@ -51,8 +52,8 @@ TTconcept::TTconcept(TTscriptBase *script, ScriptType scriptType) : } TTconcept::TTconcept(TTword *word, ScriptType scriptType) : - _string1(" "), _string2(" "), _wordP(nullptr), _scriptP(nullptr), - _status(SS_VALID) { + _string1(" "), _string2(" "), _nextP(nullptr), _wordP(nullptr), _scriptP(nullptr), + _status(SS_VALID), _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) { if (!word || !setStatus() || word->getStatus()) { _status = SS_5; } else { @@ -66,8 +67,9 @@ TTconcept::TTconcept(TTword *word, ScriptType scriptType) : } TTconcept::TTconcept(TTconcept &src) : - _string1(src._string1), _string2(src._string2), - _wordP(nullptr), _scriptP(nullptr), _status(SS_VALID) { + _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) { if (src.getStatus()) { _status = SS_5; } else { |