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

[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:
8e62240ed9 TITANIC: Show NPC portrait in Conversations tab after loading savegame


Commit: 8e62240ed95acd53187815299f105cf7924a12c4
    https://github.com/scummvm/scummvm/commit/8e62240ed95acd53187815299f105cf7924a12c4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-25T17:37:03-04:00

Commit Message:
TITANIC: Show NPC portrait in Conversations tab after loading savegame

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


diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp
index 8157e1c..6f49dbe 100644
--- a/engines/titanic/pet_control/pet_conversations.cpp
+++ b/engines/titanic/pet_control/pet_conversations.cpp
@@ -99,6 +99,10 @@ bool CPetConversations::reset() {
 		_log.setColor(getColor(2));
 	}
 
+	// WORKAROUND: After loading, mark log as changed so the
+	// current NPC portrait to display gets recalculated
+	_logChanged = true;
+
 	return true;
 }