TITANIC: Extra initialization of TTconcept fields

scummvm · Dec 16, 2016 · dc58af2 · dc58af2
1 parent 8777868
commit dc58af2
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp
@@ -28,16 +28,17 @@
 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
 		reset();
 }
 
 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 {