From eef9303027fd2ff8c71b111bb0a3bcda242098bc Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 29 Jul 2016 22:07:49 -0400
Subject: TITANIC: Handle NPC postResponse methods

---
 engines/titanic/true_talk/barbot_script.cpp   | 3 ---
 engines/titanic/true_talk/barbot_script.h     | 2 --
 engines/titanic/true_talk/bellbot_script.cpp  | 3 ---
 engines/titanic/true_talk/bellbot_script.h    | 1 -
 engines/titanic/true_talk/deskbot_script.cpp  | 3 ---
 engines/titanic/true_talk/deskbot_script.h    | 1 -
 engines/titanic/true_talk/doorbot_script.cpp  | 3 ---
 engines/titanic/true_talk/doorbot_script.h    | 1 -
 engines/titanic/true_talk/liftbot_script.cpp  | 3 ---
 engines/titanic/true_talk/liftbot_script.h    | 1 -
 engines/titanic/true_talk/maitred_script.cpp  | 3 ---
 engines/titanic/true_talk/maitred_script.h    | 1 -
 engines/titanic/true_talk/parrot_script.cpp   | 3 ---
 engines/titanic/true_talk/parrot_script.h     | 1 -
 engines/titanic/true_talk/succubus_script.cpp | 3 ---
 engines/titanic/true_talk/succubus_script.h   | 1 -
 engines/titanic/true_talk/tt_npc_script.cpp   | 5 +----
 engines/titanic/true_talk/tt_npc_script.h     | 7 ++++++-
 18 files changed, 7 insertions(+), 38 deletions(-)

(limited to 'engines/titanic/true_talk')

diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp
index 81682a2f7e..25252cc82c 100644
--- a/engines/titanic/true_talk/barbot_script.cpp
+++ b/engines/titanic/true_talk/barbot_script.cpp
@@ -1155,9 +1155,6 @@ int BarbotScript::proc25(int val1, const int *srcIdP, TTroomScript *roomScript,
 	return 2;
 }
 
-void BarbotScript::proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {
-}
-
 void BarbotScript::setDialRegion(int dialNum, int region) {
 	TTnpcScript::setDialRegion(dialNum, region);
 	selectResponse(250365);
diff --git a/engines/titanic/true_talk/barbot_script.h b/engines/titanic/true_talk/barbot_script.h
index 8a81099fd4..d1da7e1923 100644
--- a/engines/titanic/true_talk/barbot_script.h
+++ b/engines/titanic/true_talk/barbot_script.h
@@ -92,8 +92,6 @@ public:
 
 	virtual int proc25(int val1, const int *srcIdP, TTroomScript *roomScript, TTsentence *sentence);
 
-	virtual void proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence);
-
 	/**
 	 * Sets a given dial to be pointing in a specified region (0 to 2)
 	 */
diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp
index 88f13cc351..ee964cbf25 100644
--- a/engines/titanic/true_talk/bellbot_script.cpp
+++ b/engines/titanic/true_talk/bellbot_script.cpp
@@ -407,9 +407,6 @@ int BellbotScript::proc25(int val1, const int *srcIdP, TTroomScript *roomScript,
 	return 0;
 }
 
-void BellbotScript::proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {
-}
-
 int BellbotScript::proc36(int id) const {
 	warning("TODO");
 	return 0;
diff --git a/engines/titanic/true_talk/bellbot_script.h b/engines/titanic/true_talk/bellbot_script.h
index 60459651cf..fc88f62798 100644
--- a/engines/titanic/true_talk/bellbot_script.h
+++ b/engines/titanic/true_talk/bellbot_script.h
@@ -90,7 +90,6 @@ public:
 
 	virtual int proc25(int val1, const int *srcIdP, TTroomScript *roomScript, TTsentence *sentence);
 
-	virtual void proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence);
 	virtual int proc36(int val) const;
 };
 
diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp
index 90fab86111..5b4eec13cd 100644
--- a/engines/titanic/true_talk/deskbot_script.cpp
+++ b/engines/titanic/true_talk/deskbot_script.cpp
@@ -312,9 +312,6 @@ int DeskbotScript::proc25(int val1, const int *srcIdP, TTroomScript *roomScript,
 	return 0;
 }
 
-void DeskbotScript::proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {
-}
-
 int DeskbotScript::proc36(int id) const {
 	warning("TODO");
 	return 0;
diff --git a/engines/titanic/true_talk/deskbot_script.h b/engines/titanic/true_talk/deskbot_script.h
index 09ae9c839e..2e814eed3b 100644
--- a/engines/titanic/true_talk/deskbot_script.h
+++ b/engines/titanic/true_talk/deskbot_script.h
@@ -91,7 +91,6 @@ public:
 
 	virtual int proc23() const;
 	virtual int proc25(int val1, const int *srcIdP, TTroomScript *roomScript, TTsentence *sentence);
-	virtual void proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence);
 	virtual int proc36(int val) const;
 
 	/**
diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp
index d4c18cfc60..050a5440a7 100644
--- a/engines/titanic/true_talk/doorbot_script.cpp
+++ b/engines/titanic/true_talk/doorbot_script.cpp
@@ -515,9 +515,6 @@ int DoorbotScript::proc25(int val1, const int *srcIdP, TTroomScript *roomScript,
 	return 0;
 }
 
-void DoorbotScript::proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {
-}
-
 void DoorbotScript::setDialRegion(int dialNum, int region) {
 	TTnpcScript::setDialRegion(dialNum, region);
 	if (dialNum == 1 && region != 1) {
diff --git a/engines/titanic/true_talk/doorbot_script.h b/engines/titanic/true_talk/doorbot_script.h
index 7aac6b2a98..11d4dd3190 100644
--- a/engines/titanic/true_talk/doorbot_script.h
+++ b/engines/titanic/true_talk/doorbot_script.h
@@ -89,7 +89,6 @@ public:
 	virtual uint getDialsBitset() const;
 
 	virtual int proc25(int val1, const int *srcIdP, TTroomScript *roomScript, TTsentence *sentence);
-	virtual void proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence);
 
 	/**
 	 * Sets a given dial to be pointing in a specified region (0 to 2)
diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp
index 0f582154cf..7afd2c47ac 100644
--- a/engines/titanic/true_talk/liftbot_script.cpp
+++ b/engines/titanic/true_talk/liftbot_script.cpp
@@ -354,9 +354,6 @@ int LiftbotScript::proc25(int val1, const int *srcIdP, TTroomScript *roomScript,
 	return 0;
 }
 
-void LiftbotScript::proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {
-}
-
 void LiftbotScript::setDialRegion(int dialNum, int region) {
 	TTnpcScript::setDialRegion(dialNum, region);
 	addResponse(getDialogueId(210688));
diff --git a/engines/titanic/true_talk/liftbot_script.h b/engines/titanic/true_talk/liftbot_script.h
index 33da983323..968e80dcf5 100644
--- a/engines/titanic/true_talk/liftbot_script.h
+++ b/engines/titanic/true_talk/liftbot_script.h
@@ -86,7 +86,6 @@ public:
 	virtual uint getDialsBitset() const;
 
 	virtual int proc25(int val1, const int *srcIdP, TTroomScript *roomScript, TTsentence *sentence);
-	virtual void proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence);
 
 	/**
 	 * Sets a given dial to be pointing in a specified region (0 to 2)
diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp
index c6ceca89c7..0ef94e0910 100644
--- a/engines/titanic/true_talk/maitred_script.cpp
+++ b/engines/titanic/true_talk/maitred_script.cpp
@@ -311,9 +311,6 @@ int MaitreDScript::proc25(int val1, const int *srcIdP, TTroomScript *roomScript,
 	return 0;
 }
 
-void MaitreDScript::proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {
-}
-
 uint MaitreDScript::getStateDialogueId(uint oldId, uint newId) {
 	if (getValue(8) || getValue(9))
 		return newId;
diff --git a/engines/titanic/true_talk/maitred_script.h b/engines/titanic/true_talk/maitred_script.h
index 60113b82dc..3cb2b5ab67 100644
--- a/engines/titanic/true_talk/maitred_script.h
+++ b/engines/titanic/true_talk/maitred_script.h
@@ -90,7 +90,6 @@ public:
 
 	virtual int proc23() const;
 	virtual int proc25(int val1, const int *srcIdP, TTroomScript *roomScript, TTsentence *sentence);
-	virtual void proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence);
 };
 
 } // End of namespace Titanic
diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp
index 01d998d9e8..c2f08ca37b 100644
--- a/engines/titanic/true_talk/parrot_script.cpp
+++ b/engines/titanic/true_talk/parrot_script.cpp
@@ -111,7 +111,4 @@ int ParrotScript::proc25(int val1, const int *srcIdP, TTroomScript *roomScript,
 	return 0;
 }
 
-void ParrotScript::proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {
-}
-
 } // End of namespace Titanic
diff --git a/engines/titanic/true_talk/parrot_script.h b/engines/titanic/true_talk/parrot_script.h
index e832f7cfe7..620e098c0d 100644
--- a/engines/titanic/true_talk/parrot_script.h
+++ b/engines/titanic/true_talk/parrot_script.h
@@ -54,7 +54,6 @@ public:
 
 	virtual int proc23() const;
 	virtual int proc25(int val1, const int *srcIdP, TTroomScript *roomScript, TTsentence *sentence);
-	virtual void proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence);
 };
 
 } // End of namespace Titanic
diff --git a/engines/titanic/true_talk/succubus_script.cpp b/engines/titanic/true_talk/succubus_script.cpp
index a6e1f7fccc..1050ba2a6c 100644
--- a/engines/titanic/true_talk/succubus_script.cpp
+++ b/engines/titanic/true_talk/succubus_script.cpp
@@ -99,7 +99,4 @@ int SuccUBusScript::proc25(int val1, const int *srcIdP, TTroomScript *roomScript
 	return 0;
 }
 
-void SuccUBusScript::proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {
-}
-
 } // End of namespace Titanic
diff --git a/engines/titanic/true_talk/succubus_script.h b/engines/titanic/true_talk/succubus_script.h
index 560272bdd9..7acc27fa0a 100644
--- a/engines/titanic/true_talk/succubus_script.h
+++ b/engines/titanic/true_talk/succubus_script.h
@@ -61,7 +61,6 @@ public:
 
 	virtual int proc23() const;
 	virtual int proc25(int val1, const int *srcIdP, TTroomScript *roomScript, TTsentence *sentence);
-	virtual void proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence);
 };
 
 } // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp
index 4cd964d57b..7b25c66cc5 100644
--- a/engines/titanic/true_talk/tt_npc_script.cpp
+++ b/engines/titanic/true_talk/tt_npc_script.cpp
@@ -390,9 +390,6 @@ int TTnpcScript::proc25(int val1, const int *srcIdP, TTroomScript *roomScript, T
 	return 0;
 }
 
-void TTnpcScript::proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {
-}
-
 void TTnpcScript::save(SimpleFile *file) {
 	file->writeNumber(charId());
 	saveBody(file);
@@ -748,7 +745,7 @@ int TTnpcScript::processEntries(const TTsentenceEntries *entries, uint entryCoun
 					applyResponse();
 
 					if (entry._field30)
-						proc26(entry._field30, &entry, roomScript, sentence);
+						postResponse(entry._field30, &entry, roomScript, sentence);
 
 					return 2;
 				}
diff --git a/engines/titanic/true_talk/tt_npc_script.h b/engines/titanic/true_talk/tt_npc_script.h
index f52df351b3..735e8b85b4 100644
--- a/engines/titanic/true_talk/tt_npc_script.h
+++ b/engines/titanic/true_talk/tt_npc_script.h
@@ -273,7 +273,12 @@ public:
 	
 	virtual const TTscriptMapping *getMapping(int index);
 	virtual int proc25(int val1, const int *srcIdP, TTroomScript *roomScript, TTsentence *sentence);
-	virtual void proc26(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence);
+
+	/**
+	 * Handles any post-response NPC processing
+	 */
+	virtual void postResponse(int v1, const TTsentenceEntry *entry, TTroomScript *roomScript, TTsentence *sentence) {}
+	
 	virtual void save(SimpleFile *file);
 	virtual void load(SimpleFile *file);
 	virtual void saveBody(SimpleFile *file);
-- 
cgit v1.2.3