diff options
author | Paul Gilbert | 2016-06-07 20:13:20 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-15 19:20:56 -0400 |
commit | 02cd4557a40d10f50b76425c7df0a26cc46aa6a8 (patch) | |
tree | 4adccc405773395d82f1f186a7fac84a40c18f19 | |
parent | e9c3d180cd245fd25fb0f234e55e30ea864634ce (diff) | |
download | scummvm-rg350-02cd4557a40d10f50b76425c7df0a26cc46aa6a8.tar.gz scummvm-rg350-02cd4557a40d10f50b76425c7df0a26cc46aa6a8.tar.bz2 scummvm-rg350-02cd4557a40d10f50b76425c7df0a26cc46aa6a8.zip |
TITANIC: Remove unneeded NPC setupRanges methods
-rw-r--r-- | engines/titanic/true_talk/barbot_script.cpp | 5 | ||||
-rw-r--r-- | engines/titanic/true_talk/barbot_script.h | 5 | ||||
-rw-r--r-- | engines/titanic/true_talk/bellbot_script.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/bellbot_script.h | 5 | ||||
-rw-r--r-- | engines/titanic/true_talk/deskbot_script.cpp | 5 | ||||
-rw-r--r-- | engines/titanic/true_talk/deskbot_script.h | 5 | ||||
-rw-r--r-- | engines/titanic/true_talk/doorbot_script.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/doorbot_script.h | 5 | ||||
-rw-r--r-- | engines/titanic/true_talk/liftbot_script.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/liftbot_script.h | 5 | ||||
-rw-r--r-- | engines/titanic/true_talk/maitred_script.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/maitred_script.h | 5 | ||||
-rw-r--r-- | engines/titanic/true_talk/parrot_script.cpp | 11 | ||||
-rw-r--r-- | engines/titanic/true_talk/parrot_script.h | 8 | ||||
-rw-r--r-- | engines/titanic/true_talk/succubus_script.cpp | 12 | ||||
-rw-r--r-- | engines/titanic/true_talk/succubus_script.h | 9 |
16 files changed, 19 insertions, 85 deletions
diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp index 2a67a7b494..dc8a5bbd62 100644 --- a/engines/titanic/true_talk/barbot_script.cpp +++ b/engines/titanic/true_talk/barbot_script.cpp @@ -118,11 +118,6 @@ bool BarbotScript::proc16() const { return false; } -bool BarbotScript::setupRanges() { - warning("TODO"); - return false; -} - bool BarbotScript::proc18() const { warning("TODO"); return false; diff --git a/engines/titanic/true_talk/barbot_script.h b/engines/titanic/true_talk/barbot_script.h index 38f6ecd907..c2f53dacf3 100644 --- a/engines/titanic/true_talk/barbot_script.h +++ b/engines/titanic/true_talk/barbot_script.h @@ -49,11 +49,6 @@ public: virtual int proc15() const; virtual bool proc16() const; - /** - * Setup range sets - */ - virtual bool setupRanges(); - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp index a02ef147c4..dec4ace8ea 100644 --- a/engines/titanic/true_talk/bellbot_script.cpp +++ b/engines/titanic/true_talk/bellbot_script.cpp @@ -39,6 +39,7 @@ BellbotScript::BellbotScript(int val1, const char *charClass, int v2, _array[0] = 100; _array[1] = 0; + loadRanges("Ranges/Bellbot"); loadResponses("Responses/Bellbot", 4); } @@ -61,11 +62,6 @@ bool BellbotScript::proc16() const { return 0; } -bool BellbotScript::setupRanges() { - warning("TODO"); - return 0; -} - bool BellbotScript::proc18() const { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/bellbot_script.h b/engines/titanic/true_talk/bellbot_script.h index 72b6a84ff5..552f834094 100644 --- a/engines/titanic/true_talk/bellbot_script.h +++ b/engines/titanic/true_talk/bellbot_script.h @@ -43,11 +43,6 @@ public: virtual int proc15() const; virtual bool proc16() const; - /** - * Setup range sets - */ - virtual bool setupRanges(); - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp index 7efd925fb0..e92dd6b790 100644 --- a/engines/titanic/true_talk/deskbot_script.cpp +++ b/engines/titanic/true_talk/deskbot_script.cpp @@ -64,11 +64,6 @@ bool DeskbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool DeskbotScript::setupRanges() { - warning("TODO"); - return 0; -} - bool DeskbotScript::proc18() const { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/deskbot_script.h b/engines/titanic/true_talk/deskbot_script.h index 2fd5945776..144209a7e7 100644 --- a/engines/titanic/true_talk/deskbot_script.h +++ b/engines/titanic/true_talk/deskbot_script.h @@ -39,11 +39,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - /** - * Setup range sets - */ - virtual bool setupRanges(); - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp index 7d291b6e7d..65fc194c11 100644 --- a/engines/titanic/true_talk/doorbot_script.cpp +++ b/engines/titanic/true_talk/doorbot_script.cpp @@ -35,6 +35,7 @@ DoorbotScript::DoorbotScript(int val1, const char *charClass, int v2, TTnpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) { Common::fill(&_array[0], &_array[148], 0); _state = 0; + loadRanges("Ranges/Doorbot"); loadResponses("Responses/Doorbot"); } @@ -114,11 +115,6 @@ bool DoorbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool DoorbotScript::setupRanges() { - warning("TODO"); - return 0; -} - bool DoorbotScript::proc18() const { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/doorbot_script.h b/engines/titanic/true_talk/doorbot_script.h index 05f0048fb2..4c18f1fdf4 100644 --- a/engines/titanic/true_talk/doorbot_script.h +++ b/engines/titanic/true_talk/doorbot_script.h @@ -51,11 +51,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - /** - * Setup range sets - */ - virtual bool setupRanges(); - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp index 5a63a51bb3..daa3b6c177 100644 --- a/engines/titanic/true_talk/liftbot_script.cpp +++ b/engines/titanic/true_talk/liftbot_script.cpp @@ -33,6 +33,7 @@ LiftbotScript::LiftbotScript(int val1, const char *charClass, int v2, const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : TTnpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) { _state = 0; + loadRanges("Ranges/Liftbot"); loadResponses("Responses/Liftbot"); } @@ -90,11 +91,6 @@ bool LiftbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool LiftbotScript::setupRanges() { - warning("TODO"); - return 0; -} - bool LiftbotScript::proc18() const { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/liftbot_script.h b/engines/titanic/true_talk/liftbot_script.h index ddbe92b81f..b4d739e41d 100644 --- a/engines/titanic/true_talk/liftbot_script.h +++ b/engines/titanic/true_talk/liftbot_script.h @@ -46,11 +46,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - /** - * Setup range sets - */ - virtual bool setupRanges(); - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp index 7bd19c4c71..8980da32a3 100644 --- a/engines/titanic/true_talk/maitred_script.cpp +++ b/engines/titanic/true_talk/maitred_script.cpp @@ -38,6 +38,7 @@ MaitreDScript::MaitreDScript(int val1, const char *charClass, int v2, CTrueTalkManager::setFlags(15, 0); CTrueTalkManager::setFlags(16, 0); + loadRanges("Ranges/MaitreD"); loadResponses("Responses/MaitreD"); } @@ -68,11 +69,6 @@ bool MaitreDScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool MaitreDScript::setupRanges() { - warning("TODO"); - return 0; -} - bool MaitreDScript::proc18() const { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/maitred_script.h b/engines/titanic/true_talk/maitred_script.h index c2d146efbc..b6e2369e9f 100644 --- a/engines/titanic/true_talk/maitred_script.h +++ b/engines/titanic/true_talk/maitred_script.h @@ -42,11 +42,6 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - /** - * Setup range sets - */ - virtual bool setupRanges(); - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc22(int id) const; diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp index 93312bbfd2..ecfc8e870d 100644 --- a/engines/titanic/true_talk/parrot_script.cpp +++ b/engines/titanic/true_talk/parrot_script.cpp @@ -25,6 +25,12 @@ namespace Titanic { +ParrotScript::ParrotScript(int val1, const char *charClass, int v2, + const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : + TTnpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) { + loadRanges("Ranges/Parrot"); +} + int ParrotScript::chooseResponse(TTroomScript *roomScript, TTsentence *sentence, uint tag) { if (tag == MKTAG('B', 'Y', 'Z', 'A')) { addResponse(getDialogueId(280246)); @@ -44,11 +50,6 @@ int ParrotScript::proc10() const { return 0; } -bool ParrotScript::setupRanges() { - warning("TODO"); - return 0; -} - bool ParrotScript::proc18() const { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/parrot_script.h b/engines/titanic/true_talk/parrot_script.h index dd8ed96602..ad078af9a2 100644 --- a/engines/titanic/true_talk/parrot_script.h +++ b/engines/titanic/true_talk/parrot_script.h @@ -30,8 +30,7 @@ namespace Titanic { class ParrotScript : public TTnpcScript { public: ParrotScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - TTnpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7) {} + const char *charName, int v3, int val2, int v4, int v5, int v6, int v7); /** * Chooses and adds a conversation response based on a specified tag Id. @@ -41,11 +40,6 @@ public: virtual void proc7(int v1, int v2); virtual int proc10() const; - /** - * Setup range sets - */ - virtual bool setupRanges(); - virtual bool proc18() const; virtual int proc23() const; virtual const int *getTablePtr(int id); diff --git a/engines/titanic/true_talk/succubus_script.cpp b/engines/titanic/true_talk/succubus_script.cpp index fcd0fcf829..403136880d 100644 --- a/engines/titanic/true_talk/succubus_script.cpp +++ b/engines/titanic/true_talk/succubus_script.cpp @@ -25,6 +25,13 @@ namespace Titanic { +SuccUBusScript::SuccUBusScript(int val1, const char *charClass, int v2, + const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : + TTnpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7), + _field2D0(0) { + loadRanges("Ranges/SuccUBus"); +} + int SuccUBusScript::chooseResponse(TTroomScript *roomScript, TTsentence *sentence, uint tag) { uint dialogueId = tag; @@ -67,11 +74,6 @@ int SuccUBusScript::proc10() const { return 0; } -bool SuccUBusScript::setupRanges() { - warning("TODO"); - return 0; -} - bool SuccUBusScript::proc18() const { warning("TODO"); return 0; diff --git a/engines/titanic/true_talk/succubus_script.h b/engines/titanic/true_talk/succubus_script.h index 4a9166f6b3..77f338b771 100644 --- a/engines/titanic/true_talk/succubus_script.h +++ b/engines/titanic/true_talk/succubus_script.h @@ -32,9 +32,7 @@ private: int _field2D0; public: SuccUBusScript(int val1, const char *charClass, int v2, - const char *charName, int v3, int val2, int v4, int v5, int v6, int v7) : - TTnpcScript(val1, charClass, v2, charName, v3, val2, v4, v5, v6, v7), - _field2D0(0) {} + const char *charName, int v3, int val2, int v4, int v5, int v6, int v7); /** * Chooses and adds a conversation response based on a specified tag Id. @@ -44,11 +42,6 @@ public: virtual void proc7(int v1, int v2); virtual int proc10() const; - /** - * Setup range sets - */ - virtual bool setupRanges(); - virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc23() const; |