aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-06-09 19:26:30 -0400
committerPaul Gilbert2016-07-15 19:21:24 -0400
commit4cdd55a7f251b40b7b9b354316cf4cf3d1cc88dd (patch)
tree9e61111c6315cde40cf0fdd063f48cace73eef75
parentf88e65fe94b756c0277113f341c0d96890bd1d99 (diff)
downloadscummvm-rg350-4cdd55a7f251b40b7b9b354316cf4cf3d1cc88dd.tar.gz
scummvm-rg350-4cdd55a7f251b40b7b9b354316cf4cf3d1cc88dd.tar.bz2
scummvm-rg350-4cdd55a7f251b40b7b9b354316cf4cf3d1cc88dd.zip
TITANIC: Implemented remaining TTroomScript virtual methods
-rw-r--r--engines/titanic/true_talk/tt_room_script.cpp13
-rw-r--r--engines/titanic/true_talk/tt_room_script.h13
2 files changed, 14 insertions, 12 deletions
diff --git a/engines/titanic/true_talk/tt_room_script.cpp b/engines/titanic/true_talk/tt_room_script.cpp
index 4182498fa5..b8fbca7d39 100644
--- a/engines/titanic/true_talk/tt_room_script.cpp
+++ b/engines/titanic/true_talk/tt_room_script.cpp
@@ -37,12 +37,13 @@ TTroomScript::TTroomScript(int scriptId) :
TTroomScriptBase(scriptId, "", "", 0, -1, -1, -1, 0, 0) {
}
-void TTroomScript::proc8() {
- warning("TODO");
+bool TTroomScript::proc8() const {
+ return false;
}
-void TTroomScript::proc9() {
- warning("TODO");
+void TTroomScript::proc9(int v) {
+ if (v == 1)
+ _field54 = 1;
}
ScriptChangedResult TTroomScript::scriptChanged(TTscriptBase *npcScript, int id) {
@@ -52,8 +53,8 @@ ScriptChangedResult TTroomScript::scriptChanged(TTscriptBase *npcScript, int id)
return SCR_1;
}
-void TTroomScript::proc11() {
- warning("TODO");
+bool TTroomScript::proc11() const {
+ return true;
}
} // End of namespace Titanic
diff --git a/engines/titanic/true_talk/tt_room_script.h b/engines/titanic/true_talk/tt_room_script.h
index 4aa9b16da3..d4da5fcc10 100644
--- a/engines/titanic/true_talk/tt_room_script.h
+++ b/engines/titanic/true_talk/tt_room_script.h
@@ -47,15 +47,15 @@ public:
*/
virtual bool canProcess(TTnpcScript *npcScript, TTsentence *sentence) const = 0;
- virtual void proc8() = 0;
- virtual void proc9() = 0;
+ virtual bool proc8() const = 0;
+ virtual void proc9(int v) = 0;
/**
* Called when the script changes
*/
virtual ScriptChangedResult scriptChanged(TTscriptBase *npcScript, int id) = 0;
- virtual void proc11() = 0;
+ virtual bool proc11() const = 0;
};
@@ -79,15 +79,16 @@ public:
return true;
}
- virtual void proc8();
- virtual void proc9();
+ virtual bool proc8() const;
+
+ virtual void proc9(int v);
/**
* Called when the script changes
*/
virtual ScriptChangedResult scriptChanged(TTscriptBase *npcScript, int id);
- virtual void proc11();
+ virtual bool proc11() const;
/**
* Called with the new script and id