[Scummvm-git-logs] scummvm master -> 186697eca99b803435ba414ce28d4afafd9cd1fe

[dreammaster]

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:
186697eca9 TITANIC: Fix initialisation of the title script


Commit: 186697eca99b803435ba414ce28d4afafd9cd1fe
    https://github.com/scummvm/scummvm/commit/186697eca99b803435ba414ce28d4afafd9cd1fe
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-24T20:07:45-05:00

Commit Message:
TITANIC: Fix initialisation of the title script

Changed paths:
    engines/titanic/true_talk/script_handler.h
    engines/titanic/true_talk/tt_concept.cpp
    engines/titanic/true_talk/tt_script_base.cpp


diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h
index 85d5e2e..b8e62a5 100644
--- a/engines/titanic/true_talk/script_handler.h
+++ b/engines/titanic/true_talk/script_handler.h
@@ -33,7 +33,6 @@
 namespace Titanic {
 
 class CTitleEngine;
-class CScriptHandler;
 
 class CScriptHandler {
 private:
diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp
index 5d53860..0219915 100644
--- a/engines/titanic/true_talk/tt_concept.cpp
+++ b/engines/titanic/true_talk/tt_concept.cpp
@@ -28,7 +28,7 @@
 namespace Titanic {
 
 TTconcept::TTconcept() : _string1(" "), _string2(" "),
-		_nextP(nullptr), _scriptP(nullptr), _wordP(nullptr), _status(SS_VALID),
+		_nextP(nullptr), _scriptP(nullptr), _wordP(nullptr), _word2P(nullptr), _status(SS_VALID),
 		_scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) {
 	if (setStatus())
 		setScriptType(ST_UNKNOWN_SCRIPT);
@@ -37,7 +37,7 @@ TTconcept::TTconcept() : _string1(" "), _string2(" "),
 }
 
 TTconcept::TTconcept(TTscriptBase *script, ScriptType scriptType) :
-		_string1(" "), _string2(" "), _nextP(nullptr), _wordP(nullptr), _scriptP(nullptr),
+		_string1(" "), _string2(" "), _nextP(nullptr), _wordP(nullptr), _word2P(nullptr), _scriptP(nullptr),
 		_status(SS_VALID), _scriptType(ST_UNKNOWN_SCRIPT), _field14(0), _field20(0), _field34(0) {
 	if (!script->getStatus()) {
 		setScriptType(scriptType);
diff --git a/engines/titanic/true_talk/tt_script_base.cpp b/engines/titanic/true_talk/tt_script_base.cpp
index c1c052d..5162f4d 100644
--- a/engines/titanic/true_talk/tt_script_base.cpp
+++ b/engines/titanic/true_talk/tt_script_base.cpp
@@ -65,13 +65,8 @@ TTscriptBase::~TTscriptBase() {
 }
 
 bool TTscriptBase::isValid() {
-	if (!_charName.empty() && !_charClass.empty()) {
-		_status = SS_VALID;
-		return true;
-	} else {
-		_status = SS_11;
-		return false;
-	}
+	_status = SS_VALID;
+	return true;
 }
 
 void TTscriptBase::reset() {