diff options
Diffstat (limited to 'engines/titanic')
-rw-r--r-- | engines/titanic/true_talk/barbot_script.cpp | 12 | ||||
-rw-r--r-- | engines/titanic/true_talk/barbot_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/bellbot_script.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/bellbot_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/deskbot_script.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/deskbot_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/doorbot_script.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/doorbot_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/liftbot_script.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/liftbot_script.h | 6 | ||||
-rw-r--r-- | engines/titanic/true_talk/maitred_script.cpp | 6 | ||||
-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 | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/succubus_script.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/succubus_script.h | 4 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_named_script.cpp | 14 | ||||
-rw-r--r-- | engines/titanic/true_talk/tt_named_script.h | 8 |
18 files changed, 58 insertions, 58 deletions
diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp index a9a0be16c3..ab4fbb2384 100644 --- a/engines/titanic/true_talk/barbot_script.cpp +++ b/engines/titanic/true_talk/barbot_script.cpp @@ -44,19 +44,19 @@ int BarbotScript::proc15() const { return 0; } -int BarbotScript::proc16() const { +bool BarbotScript::proc16() const { warning("TODO"); - return 0; + return false; } -int BarbotScript::proc17() const { +bool BarbotScript::proc17() const { warning("TODO"); - return 0; + return false; } -int BarbotScript::proc18() const { +bool BarbotScript::proc18() const { warning("TODO"); - return 0; + return false; } int BarbotScript::proc21(int v) { diff --git a/engines/titanic/true_talk/barbot_script.h b/engines/titanic/true_talk/barbot_script.h index f40c67dfab..2ea86f0803 100644 --- a/engines/titanic/true_talk/barbot_script.h +++ b/engines/titanic/true_talk/barbot_script.h @@ -37,9 +37,9 @@ public: virtual void proc7(int v1, int v2); virtual int proc10() const; virtual int proc15() const; - virtual int proc16() const; - virtual int proc17() const; - virtual int proc18() const; + virtual bool proc16() const; + virtual bool proc17() const; + virtual bool proc18() const; virtual int proc21(int v); virtual int proc22() const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp index a296752004..52d8a19145 100644 --- a/engines/titanic/true_talk/bellbot_script.cpp +++ b/engines/titanic/true_talk/bellbot_script.cpp @@ -59,17 +59,17 @@ int BellbotScript::proc15() const { return 0; } -int BellbotScript::proc16() const { +bool BellbotScript::proc16() const { warning("TODO"); return 0; } -int BellbotScript::proc17() const { +bool BellbotScript::proc17() const { warning("TODO"); return 0; } -int BellbotScript::proc18() const { +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 e792d160e4..cc71c263b1 100644 --- a/engines/titanic/true_talk/bellbot_script.h +++ b/engines/titanic/true_talk/bellbot_script.h @@ -42,9 +42,9 @@ public: virtual void proc7(int v1, int v2); virtual int proc10() const; virtual int proc15() const; - virtual int proc16() const; - virtual int proc17() const; - virtual int proc18() const; + virtual bool proc16() const; + virtual bool proc17() const; + virtual bool proc18() const; virtual int proc21(int v); virtual int proc22() const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp index b79714e2e1..f17c04145e 100644 --- a/engines/titanic/true_talk/deskbot_script.cpp +++ b/engines/titanic/true_talk/deskbot_script.cpp @@ -60,17 +60,17 @@ int DeskbotScript::proc15() const { return 0; } -int DeskbotScript::proc16() const { +bool DeskbotScript::proc16() const { warning("TODO"); return 0; } -int DeskbotScript::proc17() const { +bool DeskbotScript::proc17() const { warning("TODO"); return 0; } -int DeskbotScript::proc18() const { +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 c40aca988a..dcab218e97 100644 --- a/engines/titanic/true_talk/deskbot_script.h +++ b/engines/titanic/true_talk/deskbot_script.h @@ -36,9 +36,9 @@ public: virtual void proc7(int v1, int v2); virtual int proc10() const; virtual int proc15() const; - virtual int proc16() const; - virtual int proc17() const; - virtual int proc18() const; + virtual bool proc16() const; + virtual bool proc17() const; + virtual bool proc18() const; virtual int proc21(int v); virtual int proc22() const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp index 4bca9a6491..43b9e46335 100644 --- a/engines/titanic/true_talk/doorbot_script.cpp +++ b/engines/titanic/true_talk/doorbot_script.cpp @@ -44,17 +44,17 @@ int DoorbotScript::proc15() const { return 0; } -int DoorbotScript::proc16() const { +bool DoorbotScript::proc16() const { warning("TODO"); return 0; } -int DoorbotScript::proc17() const { +bool DoorbotScript::proc17() const { warning("TODO"); return 0; } -int DoorbotScript::proc18() const { +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 549476036d..37722d4862 100644 --- a/engines/titanic/true_talk/doorbot_script.h +++ b/engines/titanic/true_talk/doorbot_script.h @@ -39,9 +39,9 @@ public: virtual void proc7(int v1, int v2); virtual int proc10() const; virtual int proc15() const; - virtual int proc16() const; - virtual int proc17() const; - virtual int proc18() const; + virtual bool proc16() const; + virtual bool proc17() const; + virtual bool proc18() const; virtual int proc21(int v); virtual int proc22() const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp index 4bd994fbbc..c30d226c89 100644 --- a/engines/titanic/true_talk/liftbot_script.cpp +++ b/engines/titanic/true_talk/liftbot_script.cpp @@ -49,17 +49,17 @@ int LiftbotScript::proc15() const { return 0; } -int LiftbotScript::proc16() const { +bool LiftbotScript::proc16() const { warning("TODO"); return 0; } -int LiftbotScript::proc17() const { +bool LiftbotScript::proc17() const { warning("TODO"); return 0; } -int LiftbotScript::proc18() const { +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 ddbdabb145..8564bb53ef 100644 --- a/engines/titanic/true_talk/liftbot_script.h +++ b/engines/titanic/true_talk/liftbot_script.h @@ -38,9 +38,9 @@ public: virtual int proc9() const; virtual int proc10() const; virtual int proc15() const; - virtual int proc16() const; - virtual int proc17() const; - virtual int proc18() const; + virtual bool proc16() const; + virtual bool proc17() const; + virtual bool proc18() const; virtual int proc21(int v); virtual int proc22() const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp index 1caec6249b..b88dfc611e 100644 --- a/engines/titanic/true_talk/maitred_script.cpp +++ b/engines/titanic/true_talk/maitred_script.cpp @@ -53,17 +53,17 @@ int MaitreDScript::proc10() const { return 0; } -int MaitreDScript::proc16() const { +bool MaitreDScript::proc16() const { warning("TODO"); return 0; } -int MaitreDScript::proc17() const { +bool MaitreDScript::proc17() const { warning("TODO"); return 0; } -int MaitreDScript::proc18() const { +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 2af3f42dac..a5fbb72c82 100644 --- a/engines/titanic/true_talk/maitred_script.h +++ b/engines/titanic/true_talk/maitred_script.h @@ -35,9 +35,9 @@ public: virtual int proc6() const; virtual void proc7(int v1, int v2); virtual int proc10() const; - virtual int proc16() const; - virtual int proc17() const; - virtual int proc18() const; + virtual bool proc16() const; + virtual bool proc17() const; + virtual bool proc18() const; virtual int proc21(int v); virtual int proc22() const; virtual int proc23() const; diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp index 9772f2111c..e97d32dd30 100644 --- a/engines/titanic/true_talk/parrot_script.cpp +++ b/engines/titanic/true_talk/parrot_script.cpp @@ -39,12 +39,12 @@ int ParrotScript::proc10() const { return 0; } -int ParrotScript::proc17() const { +bool ParrotScript::proc17() const { warning("TODO"); return 0; } -int ParrotScript::proc18() const { +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 0dde14d10f..ac0b08c982 100644 --- a/engines/titanic/true_talk/parrot_script.h +++ b/engines/titanic/true_talk/parrot_script.h @@ -36,8 +36,8 @@ public: virtual int proc6() const; virtual void proc7(int v1, int v2); virtual int proc10() const; - virtual int proc17() const; - virtual int proc18() const; + virtual bool proc17() const; + virtual bool proc18() const; virtual int proc23() const; virtual void proc24(); virtual int proc25() const; diff --git a/engines/titanic/true_talk/succubus_script.cpp b/engines/titanic/true_talk/succubus_script.cpp index c21edefd8f..0c1f6700ee 100644 --- a/engines/titanic/true_talk/succubus_script.cpp +++ b/engines/titanic/true_talk/succubus_script.cpp @@ -39,12 +39,12 @@ int SuccUBusScript::proc10() const { return 0; } -int SuccUBusScript::proc17() const { +bool SuccUBusScript::proc17() const { warning("TODO"); return 0; } -int SuccUBusScript::proc18() const { +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 595657b8e7..2131775fa5 100644 --- a/engines/titanic/true_talk/succubus_script.h +++ b/engines/titanic/true_talk/succubus_script.h @@ -39,8 +39,8 @@ public: virtual int proc6() const; virtual void proc7(int v1, int v2); virtual int proc10() const; - virtual int proc17() const; - virtual int proc18() const; + virtual bool proc17() const; + virtual bool proc18() const; virtual int proc21(int v); virtual int proc23() const; virtual void proc24(); diff --git a/engines/titanic/true_talk/tt_named_script.cpp b/engines/titanic/true_talk/tt_named_script.cpp index dfc5bb243d..89adb16702 100644 --- a/engines/titanic/true_talk/tt_named_script.cpp +++ b/engines/titanic/true_talk/tt_named_script.cpp @@ -91,7 +91,7 @@ int TTNamedScript::proc12() const { return 1; } -void TTNamedScript::proc13() const { +bool TTNamedScript::proc13() const { warning("TODO"); } @@ -103,16 +103,16 @@ int TTNamedScript::proc15() const { return 0; } -int TTNamedScript::proc16() const { - return 1; +bool TTNamedScript::proc16() const { + return true; } -int TTNamedScript::proc17() const { - return 1; +bool TTNamedScript::proc17() const { + return true; } -int TTNamedScript::proc18() const { - return 1; +bool TTNamedScript::proc18() const { + return true; } void TTNamedScript::proc19(int v) { diff --git a/engines/titanic/true_talk/tt_named_script.h b/engines/titanic/true_talk/tt_named_script.h index 968ec2222e..9186507e87 100644 --- a/engines/titanic/true_talk/tt_named_script.h +++ b/engines/titanic/true_talk/tt_named_script.h @@ -81,12 +81,12 @@ public: virtual int proc10() const; virtual int proc11() const; virtual int proc12() const; - virtual void proc13() const; + virtual bool proc13() const; virtual void proc14(int v); virtual int proc15() const; - virtual int proc16() const; - virtual int proc17() const; - virtual int proc18() const; + virtual bool proc16() const; + virtual bool proc17() const; + virtual bool proc18() const; virtual void proc19(int v); virtual void proc20(int v); virtual int proc21(int v); |