From 4d22064997b286fdf6eb179c710f2bd0ae539943 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 5 May 2016 23:33:26 -0400 Subject: TITANIC: Beginnings of script handler --- engines/titanic/true_talk/script_handler.h | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 engines/titanic/true_talk/script_handler.h (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h new file mode 100644 index 0000000000..69c1c9486a --- /dev/null +++ b/engines/titanic/true_talk/script_handler.h @@ -0,0 +1,47 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef TITANIC_SCRIPT_HANDLER_H +#define TITANIC_SCRIPT_HANDLER_H + +#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_room_script.h" + +namespace Titanic { + +class CTitleEngine; + +class CScriptHandler { +private: + CTitleEngine *_owner; +public: + CScriptHandler(CTitleEngine *owner, int val1, int val2); + + /** + * Set the character and room + */ + void setup(TTNamedScript *npcScript, TTRoomScript *roomScript, uint charId); +}; + +} // End of namespace Titanic + +#endif /* TITANIC_SCRIPT_HANDLER_H */ -- cgit v1.2.3 From 1e42f6ffed4c1d187863b548c708b42d611aab0e Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 6 May 2016 21:27:50 -0400 Subject: TITANIC: Beginnings of input line processing --- engines/titanic/true_talk/script_handler.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 69c1c9486a..1959468ed0 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -25,6 +25,7 @@ #include "titanic/true_talk/tt_named_script.h" #include "titanic/true_talk/tt_room_script.h" +#include "titanic/true_talk/tt_string.h" namespace Titanic { @@ -40,6 +41,9 @@ public: * Set the character and room */ void setup(TTNamedScript *npcScript, TTRoomScript *roomScript, uint charId); + + void processInput(TTNamedScript *npcScript, TTRoomScript *roomScript, + const TTString &line); }; } // End of namespace Titanic -- cgit v1.2.3 From 339df8657e883ba62bd5c4c474ab920dfa3d19c8 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 7 May 2016 16:50:39 -0400 Subject: TITANIC: Implement CTrueTalkManager triggerNPC --- engines/titanic/true_talk/script_handler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 1959468ed0..8d5c78dbc3 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -40,7 +40,7 @@ public: /** * Set the character and room */ - void setup(TTNamedScript *npcScript, TTRoomScript *roomScript, uint charId); + void setup(TTRoomScript *roomScript, TTNamedScript *npcScript, uint charId); void processInput(TTNamedScript *npcScript, TTRoomScript *roomScript, const TTString &line); -- cgit v1.2.3 From babdf0aa036a62e098be2e0aef7082e315afbf62 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 7 May 2016 20:52:36 -0400 Subject: TITANIC: Setting up of title engine and title script --- engines/titanic/true_talk/script_handler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 8d5c78dbc3..1206afe48e 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -42,7 +42,7 @@ public: */ void setup(TTRoomScript *roomScript, TTNamedScript *npcScript, uint charId); - void processInput(TTNamedScript *npcScript, TTRoomScript *roomScript, + void processInput(TTRoomScript *roomScript, TTNamedScript *npcScript, const TTString &line); }; -- cgit v1.2.3 From 0cbd9f5063715a35196c40d0e92a21e73b9f15e2 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 7 May 2016 22:24:46 -0400 Subject: TITANIC: Changing TTNamed* classes to TTNpc* --- engines/titanic/true_talk/script_handler.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 1206afe48e..6a1e0dc0f1 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -23,7 +23,7 @@ #ifndef TITANIC_SCRIPT_HANDLER_H #define TITANIC_SCRIPT_HANDLER_H -#include "titanic/true_talk/tt_named_script.h" +#include "titanic/true_talk/tt_npc_script.h" #include "titanic/true_talk/tt_room_script.h" #include "titanic/true_talk/tt_string.h" @@ -40,9 +40,9 @@ public: /** * Set the character and room */ - void setup(TTRoomScript *roomScript, TTNamedScript *npcScript, uint charId); + void setup(TTRoomScript *roomScript, TTNpcScript *npcScript, uint charId); - void processInput(TTRoomScript *roomScript, TTNamedScript *npcScript, + void processInput(TTRoomScript *roomScript, TTNpcScript *npcScript, const TTString &line); }; -- cgit v1.2.3 From 74935b371fa94637f5592e402110c3b41cd0b3c4 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 8 May 2016 10:59:03 -0400 Subject: TITANIC: Implementing scriptChanged methods --- engines/titanic/true_talk/script_handler.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 6a1e0dc0f1..868a2c3eaa 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -34,13 +34,25 @@ class CTitleEngine; class CScriptHandler { private: CTitleEngine *_owner; + TTScriptBase *_script; + int _field8; + int _fieldC; + int _field10; + int _field14; + int _field18; + int _inputCtr; + int _field20; + int _field24; + int _field28; + int _field2C; + int _field30; public: CScriptHandler(CTitleEngine *owner, int val1, int val2); /** * Set the character and room */ - void setup(TTRoomScript *roomScript, TTNpcScript *npcScript, uint charId); + int scriptChanged(TTRoomScript *roomScript, TTNpcScript *npcScript, uint dialogueId); void processInput(TTRoomScript *roomScript, TTNpcScript *npcScript, const TTString &line); -- cgit v1.2.3 From c4375b134a57e3217d24e146592560f1ba9342d7 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 8 May 2016 12:09:32 -0400 Subject: TITANIC: Beginnings of STVocab class, CScriptHandler constructor --- engines/titanic/true_talk/script_handler.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 868a2c3eaa..fba1e41a2e 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -26,6 +26,8 @@ #include "titanic/true_talk/tt_npc_script.h" #include "titanic/true_talk/tt_room_script.h" #include "titanic/true_talk/tt_string.h" +#include "titanic/true_talk/st_vocab.h" +#include "titanic/support/file_reader.h" namespace Titanic { @@ -35,8 +37,8 @@ class CScriptHandler { private: CTitleEngine *_owner; TTScriptBase *_script; - int _field8; - int _fieldC; + CFileReader &_reader; + STVocab _vocab; int _field10; int _field14; int _field18; -- cgit v1.2.3 From 71179e376363c1c59b9c7819bfbe89196c7bbc23 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 8 May 2016 14:37:18 -0400 Subject: TITANIC: More script handler setup --- engines/titanic/true_talk/script_handler.h | 33 +++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index fba1e41a2e..16dff1bf36 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -32,6 +32,33 @@ namespace Titanic { class CTitleEngine; +class CScriptHandler; + +class CScriptHandlerSub1 { +public: + int _field0; + int _field4; + int _field8; + int _fieldC; + int _field10; +public: + CScriptHandlerSub1() : _field0(0), _field4(0), _field8(0), + _fieldC(0), _field10(0) {} +}; + +class CScriptHandlerSub2 { +public: + CScriptHandler *_owner; + int _field4; + int _field8; + int _fieldC; + int _field10; + int _field14; + int _field18; +public: + CScriptHandlerSub2(CScriptHandler *owner) : _owner(owner), _field4(0), _field8(0), + _fieldC(0), _field10(0), _field14(0), _field18(0) {} +}; class CScriptHandler { private: @@ -40,8 +67,8 @@ private: CFileReader &_reader; STVocab _vocab; int _field10; - int _field14; - int _field18; + CScriptHandlerSub1 _sub1; + CScriptHandlerSub2 _sub2; int _inputCtr; int _field20; int _field24; @@ -54,7 +81,7 @@ public: /** * Set the character and room */ - int scriptChanged(TTRoomScript *roomScript, TTNpcScript *npcScript, uint dialogueId); + ScriptChangedResult scriptChanged(TTRoomScript *roomScript, TTNpcScript *npcScript, uint dialogueId); void processInput(TTRoomScript *roomScript, TTNpcScript *npcScript, const TTString &line); -- cgit v1.2.3 From 9ce6391a94db959f3dde54ed3d0153e000aa3d5a Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 8 May 2016 20:57:03 -0400 Subject: TITANIC: Beginnings of TTWord hierarchy --- engines/titanic/true_talk/script_handler.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 16dff1bf36..38da259021 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -85,6 +85,11 @@ public: void processInput(TTRoomScript *roomScript, TTNpcScript *npcScript, const TTString &line); + + /** + * Open a resource for access + */ + SimpleFile *openResource(const CString &name); }; } // End of namespace Titanic -- cgit v1.2.3 From 45f84a9da592fbc76156801c634d60615ace67a2 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 9 May 2016 19:18:03 -0400 Subject: TITANIC: Fix script handler initialization --- engines/titanic/true_talk/script_handler.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 38da259021..58d58d6d27 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -64,8 +64,8 @@ class CScriptHandler { private: CTitleEngine *_owner; TTScriptBase *_script; + STVocab *_vocab; CFileReader &_reader; - STVocab _vocab; int _field10; CScriptHandlerSub1 _sub1; CScriptHandlerSub2 _sub2; @@ -77,6 +77,7 @@ private: int _field30; public: CScriptHandler(CTitleEngine *owner, int val1, int val2); + ~CScriptHandler(); /** * Set the character and room -- cgit v1.2.3 From 7700923298da4002a5d0baf28913a46e7e0fcf59 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 11 May 2016 21:17:28 -0400 Subject: TITANIC: Change CFileReader to CExeResoucres --- engines/titanic/true_talk/script_handler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 58d58d6d27..8449a72282 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -27,7 +27,7 @@ #include "titanic/true_talk/tt_room_script.h" #include "titanic/true_talk/tt_string.h" #include "titanic/true_talk/st_vocab.h" -#include "titanic/support/file_reader.h" +#include "titanic/support/exe_resources.h" namespace Titanic { @@ -65,7 +65,7 @@ private: CTitleEngine *_owner; TTScriptBase *_script; STVocab *_vocab; - CFileReader &_reader; + CExeResources &_resources; int _field10; CScriptHandlerSub1 _sub1; CScriptHandlerSub2 _sub2; -- cgit v1.2.3 From 4410c75599def09cfbb181268f5a894f1aa11b44 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 11 May 2016 21:47:47 -0400 Subject: TITANIC: Rename STVocab to TTvocab to match original --- engines/titanic/true_talk/script_handler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 8449a72282..80532a7dda 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -26,7 +26,7 @@ #include "titanic/true_talk/tt_npc_script.h" #include "titanic/true_talk/tt_room_script.h" #include "titanic/true_talk/tt_string.h" -#include "titanic/true_talk/st_vocab.h" +#include "titanic/true_talk/tt_vocab.h" #include "titanic/support/exe_resources.h" namespace Titanic { @@ -64,7 +64,7 @@ class CScriptHandler { private: CTitleEngine *_owner; TTScriptBase *_script; - STVocab *_vocab; + TTvocab *_vocab; CExeResources &_resources; int _field10; CScriptHandlerSub1 _sub1; -- cgit v1.2.3 From 7b71462046155e2927bd1f76634ea9b5bf45d381 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 12 May 2016 20:16:08 -0400 Subject: TITANIC: Implementing virtual methods for TTword --- engines/titanic/true_talk/script_handler.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 80532a7dda..73ddb7bee4 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -91,6 +91,8 @@ public: * Open a resource for access */ SimpleFile *openResource(const CString &name); + + }; } // End of namespace Titanic -- cgit v1.2.3 From e8971dd106fa28fe1d4ef8e00ee34ec623a746c9 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 12 May 2016 21:35:28 -0400 Subject: TITANIC: Rename CScriptHandlerSub2 to TTparser --- engines/titanic/true_talk/script_handler.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 73ddb7bee4..7692959e71 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -24,6 +24,7 @@ #define TITANIC_SCRIPT_HANDLER_H #include "titanic/true_talk/tt_npc_script.h" +#include "titanic/true_talk/tt_parser.h" #include "titanic/true_talk/tt_room_script.h" #include "titanic/true_talk/tt_string.h" #include "titanic/true_talk/tt_vocab.h" @@ -46,20 +47,6 @@ public: _fieldC(0), _field10(0) {} }; -class CScriptHandlerSub2 { -public: - CScriptHandler *_owner; - int _field4; - int _field8; - int _fieldC; - int _field10; - int _field14; - int _field18; -public: - CScriptHandlerSub2(CScriptHandler *owner) : _owner(owner), _field4(0), _field8(0), - _fieldC(0), _field10(0), _field14(0), _field18(0) {} -}; - class CScriptHandler { private: CTitleEngine *_owner; @@ -68,7 +55,7 @@ private: CExeResources &_resources; int _field10; CScriptHandlerSub1 _sub1; - CScriptHandlerSub2 _sub2; + TTparser _parser; int _inputCtr; int _field20; int _field24; -- cgit v1.2.3 From eb948946885bc128c01f5c09da0bbdba95d2c472 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 13 May 2016 20:50:47 -0400 Subject: TITANIC: Implement TTword hierarchy virtual methods --- engines/titanic/true_talk/script_handler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 7692959e71..2da9371e7d 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -72,7 +72,7 @@ public: ScriptChangedResult scriptChanged(TTRoomScript *roomScript, TTNpcScript *npcScript, uint dialogueId); void processInput(TTRoomScript *roomScript, TTNpcScript *npcScript, - const TTString &line); + const TTstring &line); /** * Open a resource for access -- cgit v1.2.3 From e5e0e22c56ed6dca6a3471b444720b76255025e0 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 14 May 2016 00:12:47 -0400 Subject: TITANIC: Beginnings of TTinput class --- engines/titanic/true_talk/script_handler.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 2da9371e7d..86cc99cdf9 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -50,7 +50,7 @@ public: class CScriptHandler { private: CTitleEngine *_owner; - TTScriptBase *_script; + TTscriptBase *_script; TTvocab *_vocab; CExeResources &_resources; int _field10; @@ -69,9 +69,10 @@ public: /** * Set the character and room */ - ScriptChangedResult scriptChanged(TTRoomScript *roomScript, TTNpcScript *npcScript, uint dialogueId); + ScriptChangedResult scriptChanged(TTroomScript *roomScript, + TTnpcScript *npcScript, uint dialogueId); - void processInput(TTRoomScript *roomScript, TTNpcScript *npcScript, + int processInput(TTroomScript *roomScript, TTnpcScript *npcScript, const TTstring &line); /** -- cgit v1.2.3 From 378c96736a4ce86d6812886f7c06a3c6484b9de9 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 20 May 2016 07:12:32 -0400 Subject: TITANIC: Fields renaming --- engines/titanic/true_talk/script_handler.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 86cc99cdf9..891a40f527 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -51,7 +51,6 @@ class CScriptHandler { private: CTitleEngine *_owner; TTscriptBase *_script; - TTvocab *_vocab; CExeResources &_resources; int _field10; CScriptHandlerSub1 _sub1; @@ -62,6 +61,8 @@ private: int _field28; int _field2C; int _field30; +public: + TTvocab *_vocab; public: CScriptHandler(CTitleEngine *owner, int val1, int val2); ~CScriptHandler(); -- cgit v1.2.3 From 886b71048470986102ce2edf7baffc637134ac49 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 21 May 2016 16:23:52 -0400 Subject: TITANIC: Implemented TTparser checkReferent --- engines/titanic/true_talk/script_handler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 891a40f527..cf5eac1642 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -50,7 +50,6 @@ public: class CScriptHandler { private: CTitleEngine *_owner; - TTscriptBase *_script; CExeResources &_resources; int _field10; CScriptHandlerSub1 _sub1; @@ -63,6 +62,7 @@ private: int _field30; public: TTvocab *_vocab; + TTscriptBase *_script; public: CScriptHandler(CTitleEngine *owner, int val1, int val2); ~CScriptHandler(); -- cgit v1.2.3 From 6d2f65c97fd4cd23efd3e6e5e0087bf167744d89 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 22 May 2016 07:57:36 -0400 Subject: TITANIC: New TTconcept constructor and copy methods --- engines/titanic/true_talk/script_handler.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index cf5eac1642..0183612210 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -81,7 +81,10 @@ public: */ SimpleFile *openResource(const CString &name); - + /** + * Called when concept data is copied from one to another + */ + void setParserConcept(TTconcept *newConcept, TTconcept *oldConcept); }; } // End of namespace Titanic -- cgit v1.2.3 From b862f95fe175f3938905e3357d8219cf27d62ae9 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 22 May 2016 10:51:03 -0400 Subject: TITANIC: Added concept pointers to CScriptHandler --- engines/titanic/true_talk/script_handler.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 0183612210..62cf9d0ad4 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -55,10 +55,10 @@ private: CScriptHandlerSub1 _sub1; TTparser _parser; int _inputCtr; - int _field20; - int _field24; - int _field28; - int _field2C; + TTconcept *_concept1P; + TTconcept *_concept2P; + TTconcept *_concept3P; + TTconcept *_concept4P; int _field30; public: TTvocab *_vocab; -- cgit v1.2.3 From d537a25bd705d803d6fb0dc8202c8ef88460cd2c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 23 May 2016 21:37:48 -0400 Subject: TITANIC: Added TTsentenceSubBase setHandlerConcept --- engines/titanic/true_talk/script_handler.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 62cf9d0ad4..1c0824869c 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -53,16 +53,16 @@ private: CExeResources &_resources; int _field10; CScriptHandlerSub1 _sub1; - TTparser _parser; int _inputCtr; - TTconcept *_concept1P; - TTconcept *_concept2P; - TTconcept *_concept3P; - TTconcept *_concept4P; int _field30; public: + TTparser _parser; TTvocab *_vocab; TTscriptBase *_script; + TTconcept *_concept1P; + TTconcept *_concept2P; + TTconcept *_concept3P; + TTconcept *_concept4P; public: CScriptHandler(CTitleEngine *owner, int val1, int val2); ~CScriptHandler(); -- cgit v1.2.3 From 9f6a3d36f7778c5e530c03063b856212b4805ab9 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 29 May 2016 22:35:34 -0400 Subject: TITANIC: Further fleshing out of TTscriptBase --- engines/titanic/true_talk/script_handler.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 1c0824869c..10699f1157 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -85,6 +85,11 @@ public: * Called when concept data is copied from one to another */ void setParserConcept(TTconcept *newConcept, TTconcept *oldConcept); + + /** + * Sets a conversation reponse + */ + int setResponse(TTscriptBase *script, TTresponse *response); }; } // End of namespace Titanic -- cgit v1.2.3 From 928f9a8974753e84a051e354113811ba1b9548f1 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 2 Jun 2016 19:51:55 -0400 Subject: TITANIC: Remove redundant CScriptHandlerSub class --- engines/titanic/true_talk/script_handler.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 10699f1157..93abbc3d3a 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -35,24 +35,11 @@ namespace Titanic { class CTitleEngine; class CScriptHandler; -class CScriptHandlerSub1 { -public: - int _field0; - int _field4; - int _field8; - int _fieldC; - int _field10; -public: - CScriptHandlerSub1() : _field0(0), _field4(0), _field8(0), - _fieldC(0), _field10(0) {} -}; - class CScriptHandler { private: CTitleEngine *_owner; CExeResources &_resources; int _field10; - CScriptHandlerSub1 _sub1; int _inputCtr; int _field30; public: -- cgit v1.2.3 From cf805b07d33adb7809f88e8e5d297831d75df166 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 24 Jul 2016 22:13:55 -0400 Subject: TITANIC: Adding NPC Script support methods --- engines/titanic/true_talk/script_handler.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 93abbc3d3a..11976d902d 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -42,6 +42,9 @@ private: int _field10; int _inputCtr; int _field30; +private: + void handleWord1(TTstring &str); + void handleWord2(TTstring &str); public: TTparser _parser; TTvocab *_vocab; @@ -77,6 +80,8 @@ public: * Sets a conversation reponse */ int setResponse(TTscriptBase *script, TTresponse *response); + + void handleWord(TTstring &str); }; } // End of namespace Titanic -- cgit v1.2.3 From 3c547b6b354fc54a19dc88cc2470fb51093eb5bb Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 24 Jul 2016 23:08:46 -0400 Subject: TITANIC: Load word lists for each NPC Script class --- engines/titanic/true_talk/script_handler.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/titanic/true_talk/script_handler.h') diff --git a/engines/titanic/true_talk/script_handler.h b/engines/titanic/true_talk/script_handler.h index 11976d902d..193c60f719 100644 --- a/engines/titanic/true_talk/script_handler.h +++ b/engines/titanic/true_talk/script_handler.h @@ -43,8 +43,8 @@ private: int _inputCtr; int _field30; private: - void handleWord1(TTstring &str); - void handleWord2(TTstring &str); + void handleWord1(const TTstring *str); + void handleWord2(const TTstring *str); public: TTparser _parser; TTvocab *_vocab; @@ -81,7 +81,7 @@ public: */ int setResponse(TTscriptBase *script, TTresponse *response); - void handleWord(TTstring &str); + void handleWord(const TTstring *str); }; } // End of namespace Titanic -- cgit v1.2.3