From 8ec1f77c06da31787b98f14cde4bd3413a00ba9c Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 25 Oct 2016 19:26:42 -0400 Subject: TITANIC: Fix setting active NPC --- engines/titanic/pet_control/pet_control.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp index 4cdab24f6d..1876c4664e 100644 --- a/engines/titanic/pet_control/pet_control.cpp +++ b/engines/titanic/pet_control/pet_control.cpp @@ -184,7 +184,9 @@ void CPetControl::resetRemoteTarget() { } void CPetControl::setActiveNPC(CTrueTalkNPC *npc) { - if (_activeNPC == npc) { + if (_activeNPC != npc) { + _activeNPC = npc; + if (_activeNPC) { _activeNPCName = npc->getName(); _conversations.displayNPCName(npc); -- cgit v1.2.3