[Scummvm-git-logs] scummvm master -> 8ec1f77c06da31787b98f14cde4bd3413a00ba9c

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8ec1f77c06 TITANIC: Fix setting active NPC


Commit: 8ec1f77c06da31787b98f14cde4bd3413a00ba9c
    https://github.com/scummvm/scummvm/commit/8ec1f77c06da31787b98f14cde4bd3413a00ba9c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-25T19:26:42-04:00

Commit Message:
TITANIC: Fix setting active NPC

Changed paths:
    engines/titanic/pet_control/pet_control.cpp



diff --git a/engines/titanic/pet_control/pet_control.cpp b/engines/titanic/pet_control/pet_control.cpp
index 4cdab24..1876c46 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);