diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/titanic/true_talk/barbot_script.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/barbot_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/bellbot_script.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/bellbot_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/deskbot_script.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/deskbot_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/doorbot_script.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/doorbot_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/liftbot_script.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/liftbot_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/maitred_script.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/maitred_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/parrot_script.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/parrot_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/succubus_script.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/true_talk/succubus_script.h | 7 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_npc_script.h | 7 |
17 files changed, 61 insertions, 16 deletions
diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp index d6768fc359..9d4bdf6bc0 100644 --- a/engines/titanic/true_talk/barbot_script.cpp +++ b/engines/titanic/true_talk/barbot_script.cpp @@ -117,7 +117,7 @@ bool BarbotScript::proc16() const { return false; } -bool BarbotScript::proc17() const { +bool BarbotScript::setupRanges() { warning("TODO"); return false; } diff --git a/engines/titanic/true_talk/barbot_script.h b/engines/titanic/true_talk/barbot_script.h index 99dfac88ed..38f6ecd907 100644 --- a/engines/titanic/true_talk/barbot_script.h +++ b/engines/titanic/true_talk/barbot_script.h @@ -48,7 +48,12 @@ public: virtual int proc10() const; virtual int proc15() const; virtual bool proc16() const; - virtual bool proc17() 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 828d6069ea..d40de3d4b9 100644 --- a/engines/titanic/true_talk/bellbot_script.cpp +++ b/engines/titanic/true_talk/bellbot_script.cpp @@ -61,7 +61,7 @@ bool BellbotScript::proc16() const { return 0; } -bool BellbotScript::proc17() const { +bool BellbotScript::setupRanges() { warning("TODO"); return 0; } diff --git a/engines/titanic/true_talk/bellbot_script.h b/engines/titanic/true_talk/bellbot_script.h index 3c23716892..72b6a84ff5 100644 --- a/engines/titanic/true_talk/bellbot_script.h +++ b/engines/titanic/true_talk/bellbot_script.h @@ -42,7 +42,12 @@ public: virtual int proc10() const; virtual int proc15() const; virtual bool proc16() const; - virtual bool proc17() 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 4149199f56..28a211b2d1 100644 --- a/engines/titanic/true_talk/deskbot_script.cpp +++ b/engines/titanic/true_talk/deskbot_script.cpp @@ -63,7 +63,7 @@ bool DeskbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool DeskbotScript::proc17() const { +bool DeskbotScript::setupRanges() { warning("TODO"); return 0; } diff --git a/engines/titanic/true_talk/deskbot_script.h b/engines/titanic/true_talk/deskbot_script.h index f7a46c99e3..2fd5945776 100644 --- a/engines/titanic/true_talk/deskbot_script.h +++ b/engines/titanic/true_talk/deskbot_script.h @@ -38,7 +38,12 @@ public: virtual int proc15() const; virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc17() 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 e65d744605..b76f7aca9d 100644 --- a/engines/titanic/true_talk/doorbot_script.cpp +++ b/engines/titanic/true_talk/doorbot_script.cpp @@ -114,7 +114,7 @@ bool DoorbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool DoorbotScript::proc17() const { +bool DoorbotScript::setupRanges() { warning("TODO"); return 0; } diff --git a/engines/titanic/true_talk/doorbot_script.h b/engines/titanic/true_talk/doorbot_script.h index 42fcb19fa4..05f0048fb2 100644 --- a/engines/titanic/true_talk/doorbot_script.h +++ b/engines/titanic/true_talk/doorbot_script.h @@ -50,7 +50,12 @@ public: virtual int proc15() const; virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc17() 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 63900709dd..9ba80a67b4 100644 --- a/engines/titanic/true_talk/liftbot_script.cpp +++ b/engines/titanic/true_talk/liftbot_script.cpp @@ -90,7 +90,7 @@ bool LiftbotScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool LiftbotScript::proc17() const { +bool LiftbotScript::setupRanges() { warning("TODO"); return 0; } diff --git a/engines/titanic/true_talk/liftbot_script.h b/engines/titanic/true_talk/liftbot_script.h index b3ab5295d7..ddbe92b81f 100644 --- a/engines/titanic/true_talk/liftbot_script.h +++ b/engines/titanic/true_talk/liftbot_script.h @@ -46,7 +46,11 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc17() 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 b13e059d81..bdfd505e6e 100644 --- a/engines/titanic/true_talk/maitred_script.cpp +++ b/engines/titanic/true_talk/maitred_script.cpp @@ -68,7 +68,7 @@ bool MaitreDScript::handleQuote(TTroomScript *roomScript, TTsentence *sentence, return 0; } -bool MaitreDScript::proc17() const { +bool MaitreDScript::setupRanges() { warning("TODO"); return 0; } diff --git a/engines/titanic/true_talk/maitred_script.h b/engines/titanic/true_talk/maitred_script.h index 05c16ecde5..c2d146efbc 100644 --- a/engines/titanic/true_talk/maitred_script.h +++ b/engines/titanic/true_talk/maitred_script.h @@ -42,7 +42,11 @@ public: virtual bool handleQuote(TTroomScript *roomScript, TTsentence *sentence, int val, uint tagId, uint remainder) const; - virtual bool proc17() 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 a889187ee2..93312bbfd2 100644 --- a/engines/titanic/true_talk/parrot_script.cpp +++ b/engines/titanic/true_talk/parrot_script.cpp @@ -44,7 +44,7 @@ int ParrotScript::proc10() const { return 0; } -bool ParrotScript::proc17() const { +bool ParrotScript::setupRanges() { warning("TODO"); return 0; } diff --git a/engines/titanic/true_talk/parrot_script.h b/engines/titanic/true_talk/parrot_script.h index 3cf804d10d..dd8ed96602 100644 --- a/engines/titanic/true_talk/parrot_script.h +++ b/engines/titanic/true_talk/parrot_script.h @@ -40,7 +40,12 @@ public: virtual void proc7(int v1, int v2); virtual int proc10() const; - virtual bool proc17() 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 b52a02a8d5..fcd0fcf829 100644 --- a/engines/titanic/true_talk/succubus_script.cpp +++ b/engines/titanic/true_talk/succubus_script.cpp @@ -67,7 +67,7 @@ int SuccUBusScript::proc10() const { return 0; } -bool SuccUBusScript::proc17() const { +bool SuccUBusScript::setupRanges() { warning("TODO"); return 0; } diff --git a/engines/titanic/true_talk/succubus_script.h b/engines/titanic/true_talk/succubus_script.h index e9263dbf84..4a9166f6b3 100644 --- a/engines/titanic/true_talk/succubus_script.h +++ b/engines/titanic/true_talk/succubus_script.h @@ -43,7 +43,12 @@ public: virtual void proc7(int v1, int v2); virtual int proc10() const; - virtual bool proc17() const; + + /** + * Setup range sets + */ + virtual bool setupRanges(); + virtual bool proc18() const; virtual int proc21(int v1, int v2, int v3); virtual int proc23() const; diff --git a/engines/titanic/true_talk/tt_npc_script.h b/engines/titanic/true_talk/tt_npc_script.h index c76e385807..dadea17ac2 100644 --- a/engines/titanic/true_talk/tt_npc_script.h +++ b/engines/titanic/true_talk/tt_npc_script.h @@ -62,6 +62,13 @@ struct TTscriptRange { bool isSequential); }; +struct TTscriptRangeInit { + uint id; + uint *_array; + bool _isRandom; + bool _isSequential; +}; + class TTnpcScriptBase : public TTscriptBase { protected: int _field54; |