From 186697eca99b803435ba414ce28d4afafd9cd1fe Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 24 Jan 2017 20:07:45 -0500
Subject: TITANIC: Fix initialisation of the title script

---
 engines/titanic/true_talk/script_handler.h   | 1 -
 engines/titanic/true_talk/tt_concept.cpp     | 4 ++--
 engines/titanic/true_talk/tt_script_base.cpp | 9 ++-------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h
index 85d5e2e437..b8e62a586c 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 5d538606e4..02199153fb 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 c1c052d4f3..5162f4dde6 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() {
-- 
cgit v1.2.3