diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp index c734711cddf..e66c17b1bd2 100644 --- a/engines/titanic/true_talk/barbot_script.cpp +++ b/engines/titanic/true_talk/barbot_script.cpp @@ -214,11 +214,6 @@ bool BarbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return false; } -bool BarbotScript::proc18() const { - warning("TODO"); - return false; -} - int BarbotScript::proc21(int v1, int v2, int v3) { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/barbot_script.h b/engines/titanic/true_talk/barbot_script.h index 1456c8d39b2..526cf71a60b 100644 --- a/engines/titanic/true_talk/barbot_script.h +++ b/engines/titanic/true_talk/barbot_script.h @@ -67,7 +67,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp index 623fe07a5d9..3e75fce15b9 100644 --- a/engines/titanic/true_talk/bellbot_script.cpp +++ b/engines/titanic/true_talk/bellbot_script.cpp @@ -74,11 +74,6 @@ bool BellbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return false; } -bool BellbotScript::proc18() const { - warning("TODO"); - return 0; -} - int BellbotScript::proc21(int v1, int v2, int v3) { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/bellbot_script.h b/engines/titanic/true_talk/bellbot_script.h index b6aa92ee0fd..0dcdbfe29f1 100644 --- a/engines/titanic/true_talk/bellbot_script.h +++ b/engines/titanic/true_talk/bellbot_script.h @@ -58,7 +58,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp index 999dd65473e..54e22a96022 100644 --- a/engines/titanic/true_talk/deskbot_script.cpp +++ b/engines/titanic/true_talk/deskbot_script.cpp @@ -75,11 +75,6 @@ bool DeskbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool DeskbotScript::proc18() const { - warning("TODO"); - return 0; -} - int DeskbotScript::proc21(int v1, int v2, int v3) { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/deskbot_script.h b/engines/titanic/true_talk/deskbot_script.h index 973641bcc40..d0d1f8abab4 100644 --- a/engines/titanic/true_talk/deskbot_script.h +++ b/engines/titanic/true_talk/deskbot_script.h @@ -53,7 +53,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp index 65bf88c4b4f..7689fc2c04f 100644 --- a/engines/titanic/true_talk/doorbot_script.cpp +++ b/engines/titanic/true_talk/doorbot_script.cpp @@ -129,11 +129,6 @@ bool DoorbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool DoorbotScript::proc18() const { - warning("TODO"); - return 0; -} - int DoorbotScript::proc21(int v1, int v2, int v3) { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/doorbot_script.h b/engines/titanic/true_talk/doorbot_script.h index fee23734be8..97d42e39b3a 100644 --- a/engines/titanic/true_talk/doorbot_script.h +++ b/engines/titanic/true_talk/doorbot_script.h @@ -64,7 +64,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp index 36aea54838a..21bdbdde924 100644 --- a/engines/titanic/true_talk/liftbot_script.cpp +++ b/engines/titanic/true_talk/liftbot_script.cpp @@ -106,11 +106,6 @@ bool LiftbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool LiftbotScript::proc18() const { - warning("TODO"); - return 0; -} - int LiftbotScript::proc21(int v1, int v2, int v3) { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/liftbot_script.h b/engines/titanic/true_talk/liftbot_script.h index d800eed6ad5..67565f44a35 100644 --- a/engines/titanic/true_talk/liftbot_script.h +++ b/engines/titanic/true_talk/liftbot_script.h @@ -61,7 +61,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp index 987a7ffdee6..92966adeaf1 100644 --- a/engines/titanic/true_talk/maitred_script.cpp +++ b/engines/titanic/true_talk/maitred_script.cpp @@ -79,11 +79,6 @@ bool MaitreDScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool MaitreDScript::proc18() const { - warning("TODO"); - return 0; -} - int MaitreDScript::proc21(int v1, int v2, int v3) { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/maitred_script.h b/engines/titanic/true_talk/maitred_script.h index 87a1fdbf2ad..27c72f15854 100644 --- a/engines/titanic/true_talk/maitred_script.h +++ b/engines/titanic/true_talk/maitred_script.h @@ -55,7 +55,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp index e0c7a9b6d44..8e88e588102 100644 --- a/engines/titanic/true_talk/parrot_script.cpp +++ b/engines/titanic/true_talk/parrot_script.cpp @@ -103,11 +103,6 @@ ScriptChangedResult ParrotScript::scriptChanged(TTscriptBase *roomScript, uint i return (id == 3) ? SCR_2 : SCR_1; } -bool ParrotScript::proc18() const { - warning("TODO"); - return 0; -} - int ParrotScript::proc23() const { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/parrot_script.h b/engines/titanic/true_talk/parrot_script.h index 504f3112ba1..02ec4e967bc 100644 --- a/engines/titanic/true_talk/parrot_script.h +++ b/engines/titanic/true_talk/parrot_script.h @@ -52,7 +52,6 @@ public: */ virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); - virtual bool proc18() const; virtual int proc23() const; virtual const int *getTablePtr(int id); virtual int proc25(int val1, int val2, TTroomScript *roomScript, TTsentence *sentence) const; diff --git a/engines/titanic/true_talk/succubus_script.cpp b/engines/titanic/true_talk/succubus_script.cpp index 5373f3ff944..cb1b0356ab4 100644 --- a/engines/titanic/true_talk/succubus_script.cpp +++ b/engines/titanic/true_talk/succubus_script.cpp @@ -84,11 +84,6 @@ ScriptChangedResult SuccUBusScript::scriptChanged(TTscriptBase *roomScript, uint return SCR_1; } -bool SuccUBusScript::proc18() const { - warning("TODO"); - return 0; -} - int SuccUBusScript::proc21(int v1, int v2, int v3) { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/succubus_script.h b/engines/titanic/true_talk/succubus_script.h index e83475b6667..9787b2cbcf2 100644 --- a/engines/titanic/true_talk/succubus_script.h +++ b/engines/titanic/true_talk/succubus_script.h @@ -54,8 +54,6 @@ public: */ virtual ScriptChangedResult scriptChanged(TTscriptBase *roomScript, uint id); - - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc23() const; virtual const int *getTablePtr(int id); diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp index 2bfef608ddb..0de460cce33 100644 --- a/engines/titanic/true_talk/tt_npc_script.cpp +++ b/engines/titanic/true_talk/tt_npc_script.cpp @@ -267,18 +267,6 @@ int TTnpcScript::proc12() const { return 1; } -bool TTnpcScript::loadQuotes() { - // Original did a load of a global quotes here the first time - // this method is called. ScummVM implementation has refactored - // the loading to the CTrueTalkManager constructor - - if (!proc18()) { - return false; - } else { - return proc17(); - } -} - void TTnpcScript::selectResponse(int id) { if (id >= 200000 && id <= 290264) id = getDialogueId(id); @@ -295,14 +283,6 @@ bool TTnpcScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return true; } -bool TTnpcScript::proc17() const { - return true; -} - -bool TTnpcScript::proc18() const { - return true; -} - uint TTnpcScript::getRangeValue(uint id) { TTscriptRange *range = findRange(id); if (!range) diff --git a/engines/titanic/true_talk/tt_npc_script.h b/engines/titanic/true_talk/tt_npc_script.h index b12c35d67ae..b143af66da4 100644 --- a/engines/titanic/true_talk/tt_npc_script.h +++ b/engines/titanic/true_talk/tt_npc_script.h @@ -283,11 +283,6 @@ public: virtual int proc11() const; virtual int proc12() const; - /** - * Handles loading quotes used by the scripts - */ - virtual bool loadQuotes(); - /** * Translate a passed Id to a dialogue Id if necessary, * and adds it to the response @@ -299,9 +294,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc17() const; - virtual bool proc18() const; - /** * Given an Id for a previously registered set of random number values, * picks one of the array values and returns it.. depending on flags, diff --git a/engines/titanic/true_talk/tt_scripts.cpp b/engines/titanic/true_talk/tt_scripts.cpp index 94420a41122..5783866b7ef 100644 --- a/engines/titanic/true_talk/tt_scripts.cpp +++ b/engines/titanic/true_talk/tt_scripts.cpp @@ -75,8 +75,6 @@ TTscripts::TTscripts(CTitleEngine *titleEngine) : } void TTscripts::addScript(TTnpcScript *script, int scriptId) { - script->loadQuotes(); - // Find the room script this is associated with TTroomScript *roomScript = getRoomScript(scriptId); assert(roomScript);