diff options
| author | Paul Gilbert | 2016-05-06 21:40:34 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-10 16:38:38 -0400 |
| commit | b138134192bda77a4c1c941e194dc9d353aae256 (patch) | |
| tree | fb51e0b84352b1343c80996d44989acad6c0fcf0 /engines/titanic/true_talk | |
| parent | 1e42f6ffed4c1d187863b548c708b42d611aab0e (diff) | |
| download | scummvm-rg350-b138134192bda77a4c1c941e194dc9d353aae256.tar.gz scummvm-rg350-b138134192bda77a4c1c941e194dc9d353aae256.tar.bz2 scummvm-rg350-b138134192bda77a4c1c941e194dc9d353aae256.zip | |
TITANIC: Finished CTrueTalkManager start method
Diffstat (limited to 'engines/titanic/true_talk')
| -rw-r--r-- | engines/titanic/true_talk/true_talk_manager.cpp | 6 | ||||
| -rw-r--r-- | engines/titanic/true_talk/true_talk_manager.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp index dc93bf438b..58d92539a5 100644 --- a/engines/titanic/true_talk/true_talk_manager.cpp +++ b/engines/titanic/true_talk/true_talk_manager.cpp @@ -201,7 +201,7 @@ void CTrueTalkManager::update2() { //warning("CTrueTalkManager::update2"); } -void CTrueTalkManager::start(CTrueTalkNPC *npc, int val2, int val3) { +void CTrueTalkManager::start(CTrueTalkNPC *npc, uint id, CViewItem *view) { TTNamedScript *npcScript = getNpcScript(npc); TTRoomScript *roomScript = getRoomScript(); @@ -210,10 +210,10 @@ void CTrueTalkManager::start(CTrueTalkNPC *npc, int val2, int val3) { loadAssets(npc, charId); _currentNPC = npc; - warning("TODO: CTrueTalkManager::start"); + _titleEngine._scriptHandler->setup(npcScript, roomScript, charId); _currentNPC = nullptr; - //TODO: More + setView(npcScript, roomScript, view); } TTNamedScript *CTrueTalkManager::getTalker(const CString &name) const { diff --git a/engines/titanic/true_talk/true_talk_manager.h b/engines/titanic/true_talk/true_talk_manager.h index 3c24ade6cb..c3c25a33e7 100644 --- a/engines/titanic/true_talk/true_talk_manager.h +++ b/engines/titanic/true_talk/true_talk_manager.h @@ -147,7 +147,7 @@ public: /** * Start a TrueTalk conversation */ - void start(CTrueTalkNPC *npc, int val2, int val3); + void start(CTrueTalkNPC *npc, uint id, CViewItem *view); /** * Return a TrueTalk talker/script |