From a2af8fb051f3549c83ca3740cdb1702f91ca7d0f Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 2 Nov 2016 20:03:28 -0400
Subject: TITANIC: Change endTalking to setTalking

---
 engines/titanic/core/game_object.cpp | 2 +-
 engines/titanic/core/game_object.h   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'engines/titanic/core')

diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 3ca917b3a1..3738108c69 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -1660,7 +1660,7 @@ void CGameObject::startTalking(CTrueTalkNPC *npc, uint id, CViewItem *view) {
 	}
 }
 
-void CGameObject::endTalking(CTrueTalkNPC *npc, bool viewFlag, CViewItem *view) {
+void CGameObject::setTalking(CTrueTalkNPC *npc, bool viewFlag, CViewItem *view) {
 	CPetControl *pet = getPetControl();
 	if (pet)
 		pet->setActiveNPC(npc);
diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h
index 706f842252..066e51960d 100644
--- a/engines/titanic/core/game_object.h
+++ b/engines/titanic/core/game_object.h
@@ -932,19 +932,20 @@ public:
 	/*--- CTrueTalkManager Methods ---*/
 
 	/**
-	 * Stop a conversation with the NPC
+	 * Start a conversation with the NPC
 	 */
-	void endTalking(CTrueTalkNPC *npc, bool viewFlag, CViewItem *view = nullptr);
+	void startTalking(CTrueTalkNPC *npc, uint id, CViewItem *view = nullptr);
 
 	/**
 	 * Start a conversation with the NPC
 	 */
-	void startTalking(CTrueTalkNPC *npc, uint id, CViewItem *view = nullptr);
+	void startTalking(const CString &name, uint id, CViewItem *view = nullptr);
 
 	/**
 	 * Start a conversation with the NPC
 	 */
-	void startTalking(const CString &name, uint id, CViewItem *view = nullptr);
+	void setTalking(CTrueTalkNPC *npc, bool viewFlag, CViewItem *view = nullptr);
+
 
 	/**
 	 * Sets a dial region for a given NPC
-- 
cgit v1.2.3