TITANIC: Cleanup & renames for starting conversations

2 files changed, 11 insertions, 6 deletions

diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp
index c9343d1f39..6abce89148 100644
--- a/engines/titanic/true_talk/true_talk_manager.cpp
+++ b/engines/titanic/true_talk/true_talk_manager.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/true_talk/true_talk_manager.h"
 #include "titanic/core/tree_item.h"
+#include "titanic/npcs/true_talk_npc.h"
 #include "titanic/game_manager.h"
 
 #define MKTAG_BE(a3,a2,a1,a0) ((uint32)((a3) | ((a2) << 8) | ((a1) << 16) | ((a0) << 24)))
@@ -41,7 +42,7 @@ bool CTrueTalkManager::_v10;
 int CTrueTalkManager::_v11[41];
 
 CTrueTalkManager::CTrueTalkManager(CGameManager *owner) : 
-		_gameManager(owner), _scripts(&_titleEngine) {
+		_gameManager(owner), _scripts(&_titleEngine), _currentCharId(0) {
 }
 
 void CTrueTalkManager::save(SimpleFile *file) const {
@@ -192,7 +193,7 @@ void CTrueTalkManager::update2() {
 	//warning("CTrueTalkManager::update2");
 }
 
-void CTrueTalkManager::fn1(CGameObject *npc, int val2, int val3) {
+void CTrueTalkManager::start(CTrueTalkNPC *npc, int val2, int val3) {
 	warning("CTrueTalkManager::fn1");
 }
 
@@ -219,7 +220,7 @@ TTNamedScript *CTrueTalkManager::getTalker(const CString &name) const {
 	return nullptr;
 }
 
-TTNamedScript *CTrueTalkManager::getNpcScript(CGameObject *npc) const {
+TTNamedScript *CTrueTalkManager::getNpcScript(CTrueTalkNPC *npc) const {
 	CString npcName = npc->getName();
 	TTNamedScript *script = getTalker(npcName);
 
diff --git a/engines/titanic/true_talk/true_talk_manager.h b/engines/titanic/true_talk/true_talk_manager.h
index 991bf1608f..5507cf2a4c 100644
--- a/engines/titanic/true_talk/true_talk_manager.h
+++ b/engines/titanic/true_talk/true_talk_manager.h
@@ -31,13 +31,14 @@ namespace Titanic {
 
 class CGameManager;
 class CTreeItem;
-class CGameObject;
+class CTrueTalkNPC;
 
 class CTrueTalkManager {
 private:
 	CGameManager *_gameManager;
 	CTitleEngine _titleEngine;
 	TTScripts _scripts;
+	int _currentCharId;
 private:
 	/**
 	 * Loads the statics for the class
@@ -62,7 +63,7 @@ private:
 	/**
 	 * Gets the script associated with an NPC game object
 	 */
-	TTNamedScript *getNpcScript(CGameObject *npc) const;
+	TTNamedScript *getNpcScript(CTrueTalkNPC *npc) const;
 
 	/**
 	 * Gets the script associated with the current room
@@ -129,7 +130,10 @@ public:
 
 	void update2();
 
-	void fn1(CGameObject *npc, int val2, int val3);
+	/**
+	 * Start a TrueTalk conversation
+	 */
+	void start(CTrueTalkNPC *npc, int val2, int val3);
 
 	/**
 	 * Return a TrueTalk talker/script