TITANIC: Remove redundant CScriptHandlerSub class

4 files changed, 12 insertions, 20 deletions

diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp
index 5e31a9de52..cd06d71796 100644
--- a/engines/titanic/true_talk/script_handler.cpp
+++ b/engines/titanic/true_talk/script_handler.cpp
@@ -32,7 +32,7 @@ namespace Titanic {
 
 CScriptHandler::CScriptHandler(CTitleEngine *owner, int val1, int val2) :
 		_owner(owner), _script(owner->_script), _resources(g_vm->_exeResources),
-		_sub1(), _parser(this), _field10(0), _inputCtr(0), 
+		_parser(this), _field10(0), _inputCtr(0), 
 		_concept1P(nullptr), _concept2P(nullptr), _concept3P(nullptr),
 		_concept4P(nullptr), _field30(0) {
 	g_vm->_scriptHandler = this;
@@ -94,12 +94,13 @@ int CScriptHandler::processInput(TTroomScript *roomScript, TTnpcScript *npcScrip
 	}
 
 	if (canProcess == 0 || canProcess == 1) {
-		_parser.findFrames(sentence);
+		if (!_parser.findFrames(sentence)) {
+			if (roomScript->canProcess(npcScript, sentence) && npcScript) {
+				npcScript->process(roomScript, sentence);
+			}
+		}
 	}
 
-	warning("TODO: CScriptHandler::processInput");
-
-	// TODO
 	delete sentence;
 	return SS_VALID;
 }
diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h
index 10699f1157..93abbc3d3a 100644
--- a/engines/titanic/true_talk/script_handler.h
+++ b/engines/titanic/true_talk/script_handler.h
@@ -35,24 +35,11 @@ namespace Titanic {
 class CTitleEngine;
 class CScriptHandler;
 
-class CScriptHandlerSub1 {
-public:
-	int _field0;
-	int _field4;
-	int _field8;
-	int _fieldC;
-	int _field10;
-public:
-	CScriptHandlerSub1() : _field0(0), _field4(0), _field8(0),
-		_fieldC(0), _field10(0) {}
-};
-
 class CScriptHandler {
 private:
 	CTitleEngine *_owner;
 	CExeResources &_resources;
 	int _field10;
-	CScriptHandlerSub1 _sub1;
 	int _inputCtr;
 	int _field30;
 public:
diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp
index 1f1fceb156..20e7faf5a3 100644
--- a/engines/titanic/true_talk/tt_npc_script.cpp
+++ b/engines/titanic/true_talk/tt_npc_script.cpp
@@ -116,7 +116,7 @@ int TTnpcScript::chooseResponse(TTroomScript *roomScript, TTsentence *sentence,
 	return 1;
 }
 
-void TTnpcScript::proc7(int v1, int v2) {
+void TTnpcScript::process(TTroomScript *roomScript, TTsentence *sentence) {
 	warning("TODO");
 }
 
diff --git a/engines/titanic/true_talk/tt_npc_script.h b/engines/titanic/true_talk/tt_npc_script.h
index 239cccea4e..3b9ffe86f7 100644
--- a/engines/titanic/true_talk/tt_npc_script.h
+++ b/engines/titanic/true_talk/tt_npc_script.h
@@ -150,7 +150,11 @@ public:
 	 */
 	virtual int chooseResponse(TTroomScript *roomScript, TTsentence *sentence, uint tag);
 
-	virtual void proc7(int v1, int v2);
+	/**
+	 * Does further NPC specific processing of the sentence
+	 */
+	virtual void process(TTroomScript *roomScript, TTsentence *sentence);
+
 	virtual int proc8() const;
 	virtual int proc9() const;