diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/titanic/true_talk/barbot_script.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/barbot_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/bellbot_script.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/bellbot_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/deskbot_script.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/deskbot_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/doorbot_script.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/doorbot_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/liftbot_script.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/liftbot_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/maitred_script.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/maitred_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/parrot_script.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/parrot_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/succubus_script.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/succubus_script.h | 7 |
16 files changed, 61 insertions, 24 deletions
diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp index 7cc1e0a698..c734711cdd 100644 --- a/engines/titanic/true_talk/barbot_script.cpp +++ b/engines/titanic/true_talk/barbot_script.cpp @@ -198,9 +198,9 @@ int BarbotScript::process(TTroomScript *roomScript, TTsentence *sentence) { return 2; } -int BarbotScript::proc10() const { +ScriptChangedResult BarbotScript::scriptChanged(TTscriptBase *roomScript, uint id) { warning("TODO"); - return 0; + return SCR_1; } int BarbotScript::proc15() const { diff --git a/engines/titanic/true_talk/barbot_script.h b/engines/titanic/true_talk/barbot_script.h index 4232102371..1456c8d39b 100644 --- a/engines/titanic/true_talk/barbot_script.h +++ b/engines/titanic/true_talk/barbot_script.h @@ -57,7 +57,11 @@ public: */ virtual int process(TTroomScript *roomScript, TTsentence *sentence); - virtual int proc10() const; + /** + * Called when the script/id changes + */ + virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); + virtual int proc15() const; virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp index fa00718ed8..08bddcb7da 100644 --- a/engines/titanic/true_talk/bellbot_script.cpp +++ b/engines/titanic/true_talk/bellbot_script.cpp @@ -57,9 +57,9 @@ void BellbotScript::proc7(int v1, int v2) { warning("TODO"); } -int BellbotScript::proc10() const { +ScriptChangedResult BellbotScript::scriptChanged(TTscriptBase *roomScript, uint id) { warning("TODO"); - return 0; + return SCR_1; } int BellbotScript::proc15() const { diff --git a/engines/titanic/true_talk/bellbot_script.h b/engines/titanic/true_talk/bellbot_script.h index f13b1b2abe..141346f820 100644 --- a/engines/titanic/true_talk/bellbot_script.h +++ b/engines/titanic/true_talk/bellbot_script.h @@ -44,7 +44,12 @@ public: const char *charName, int v3, int val2); virtual void proc7(int v1, int v2); - virtual int proc10() const; + + /** + * Called when the script/id changes + */ + virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); + virtual int proc15() const; virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp index 019f182b1c..91d90b703b 100644 --- a/engines/titanic/true_talk/deskbot_script.cpp +++ b/engines/titanic/true_talk/deskbot_script.cpp @@ -58,9 +58,9 @@ void DeskbotScript::proc7(int v1, int v2) { warning("TODO"); } -int DeskbotScript::proc10() const { +ScriptChangedResult DeskbotScript::scriptChanged(TTscriptBase *roomScript, uint id) { warning("TODO"); - return 0; + return SCR_1; } int DeskbotScript::proc15() const { diff --git a/engines/titanic/true_talk/deskbot_script.h b/engines/titanic/true_talk/deskbot_script.h index 59438486ab..a5b879808b 100644 --- a/engines/titanic/true_talk/deskbot_script.h +++ b/engines/titanic/true_talk/deskbot_script.h @@ -39,7 +39,12 @@ public: const char *charName, int v3, int val2); virtual void proc7(int v1, int v2); - virtual int proc10() const; + + /** + * Called when the script/id changes + */ + virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); + virtual int proc15() const; virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp index bfa1ba9181..427ed65afc 100644 --- a/engines/titanic/true_talk/doorbot_script.cpp +++ b/engines/titanic/true_talk/doorbot_script.cpp @@ -112,9 +112,9 @@ void DoorbotScript::proc7(int v1, int v2) { warning("TODO"); } -int DoorbotScript::proc10() const { +ScriptChangedResult DoorbotScript::scriptChanged(TTscriptBase *roomScript, uint id) { warning("TODO"); - return 0; + return SCR_1; } int DoorbotScript::proc15() const { diff --git a/engines/titanic/true_talk/doorbot_script.h b/engines/titanic/true_talk/doorbot_script.h index ef14cf7e59..3bff98b812 100644 --- a/engines/titanic/true_talk/doorbot_script.h +++ b/engines/titanic/true_talk/doorbot_script.h @@ -50,7 +50,12 @@ public: virtual int chooseResponse(TTroomScript *roomScript, TTsentence *sentence, uint tag); virtual void proc7(int v1, int v2); - virtual int proc10() const; + + /** + * Called when the script/id changes + */ + virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); + virtual int proc15() const; virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp index cabfe41734..4a8a86060d 100644 --- a/engines/titanic/true_talk/liftbot_script.cpp +++ b/engines/titanic/true_talk/liftbot_script.cpp @@ -89,9 +89,9 @@ int LiftbotScript::proc9() const { return 0; } -int LiftbotScript::proc10() const { +ScriptChangedResult LiftbotScript::scriptChanged(TTscriptBase *roomScript, uint id) { warning("TODO"); - return 0; + return SCR_1; } int LiftbotScript::proc15() const { diff --git a/engines/titanic/true_talk/liftbot_script.h b/engines/titanic/true_talk/liftbot_script.h index 39ff9bbc52..bbe296197c 100644 --- a/engines/titanic/true_talk/liftbot_script.h +++ b/engines/titanic/true_talk/liftbot_script.h @@ -46,7 +46,12 @@ public: virtual void proc7(int v1, int v2); virtual int proc9() const; - virtual int proc10() const; + + /** + * Called when the script/id changes + */ + virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); + virtual int proc15() const; virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp index b5d5e3abeb..659d6abcfd 100644 --- a/engines/titanic/true_talk/maitred_script.cpp +++ b/engines/titanic/true_talk/maitred_script.cpp @@ -67,9 +67,9 @@ void MaitreDScript::proc7(int v1, int v2) { warning("TODO"); } -int MaitreDScript::proc10() const { +ScriptChangedResult MaitreDScript::scriptChanged(TTscriptBase *roomScript, uint id) { warning("TODO"); - return 0; + return SCR_1; } bool MaitreDScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, diff --git a/engines/titanic/true_talk/maitred_script.h b/engines/titanic/true_talk/maitred_script.h index 0c96434ed4..da73e0edbf 100644 --- a/engines/titanic/true_talk/maitred_script.h +++ b/engines/titanic/true_talk/maitred_script.h @@ -43,7 +43,11 @@ public: virtual int chooseResponse(TTroomScript *roomScript, TTsentence *sentence, uint tag); virtual void proc7(int v1, int v2); - virtual int proc10() const; + + /** + * Called when the script/id changes + */ + virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp index eb08d7ca0e..abb29d0f12 100644 --- a/engines/titanic/true_talk/parrot_script.cpp +++ b/engines/titanic/true_talk/parrot_script.cpp @@ -54,9 +54,9 @@ void ParrotScript::proc7(int v1, int v2) { warning("TODO"); } -int ParrotScript::proc10() const { +ScriptChangedResult ParrotScript::scriptChanged(TTscriptBase *roomScript, uint id) { warning("TODO"); - return 0; + return SCR_1; } bool ParrotScript::proc18() const { diff --git a/engines/titanic/true_talk/parrot_script.h b/engines/titanic/true_talk/parrot_script.h index f5d9cb2828..4d4e07dacd 100644 --- a/engines/titanic/true_talk/parrot_script.h +++ b/engines/titanic/true_talk/parrot_script.h @@ -43,7 +43,11 @@ public: virtual int chooseResponse(TTroomScript *roomScript, TTsentence *sentence, uint tag); virtual void proc7(int v1, int v2); - virtual int proc10() const; + + /** + * Called when the script/id changes + */ + virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); virtual bool proc18() const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/succubus_script.cpp b/engines/titanic/true_talk/succubus_script.cpp index 1a2348499d..9768703633 100644 --- a/engines/titanic/true_talk/succubus_script.cpp +++ b/engines/titanic/true_talk/succubus_script.cpp @@ -78,9 +78,9 @@ void SuccUBusScript::proc7(int v1, int v2) { warning("TODO"); } -int SuccUBusScript::proc10() const { +ScriptChangedResult SuccUBusScript::scriptChanged(TTscriptBase *roomScript, uint id) { warning("TODO"); - return 0; + return SCR_1; } bool SuccUBusScript::proc18() const { diff --git a/engines/titanic/true_talk/succubus_script.h b/engines/titanic/true_talk/succubus_script.h index fffdd80d89..482723c38a 100644 --- a/engines/titanic/true_talk/succubus_script.h +++ b/engines/titanic/true_talk/succubus_script.h @@ -45,7 +45,12 @@ public: virtual int chooseResponse(TTroomScript *roomScript, TTsentence *sentence, uint tag); virtual void proc7(int v1, int v2); - virtual int proc10() const; + + /** + * Called when the script/id changes + */ + virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); + virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); |