[Scummvm-cvs-logs] scummvm master -> a567c21633b5124283a13282603826266b0f9fcf

[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:
a567c21633 SHERLOCK: RT: Fix initialization of Watson's default talk file


Commit: a567c21633b5124283a13282603826266b0f9fcf
    https://github.com/scummvm/scummvm/commit/a567c21633b5124283a13282603826266b0f9fcf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-31T21:58:51-04:00

Commit Message:
SHERLOCK: RT: Fix initialization of Watson's default talk file

Changed paths:
    engines/sherlock/tattoo/tattoo_scene.cpp



diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 2e83796..3708eb0 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -84,7 +84,7 @@ bool TattooScene::loadScene(const Common::String &filename) {
 	}
 
 	// Set the NPC paths for the scene
-	setNPCPath(0);
+	setNPCPath(WATSON);
 
 	// Handle loading music for the scene
 	if (music._musicOn) {
@@ -724,7 +724,7 @@ void TattooScene::setNPCPath(int npc) {
 		return;
 
 	people[npc].clearNPC();
-	people[npc]._name = Common::String::format("WATS%.2dA", _currentScene);
+	people[npc]._npcName = Common::String::format("WATS%.2dA", _currentScene);
 
 	// If we're in the middle of a script that will continue once the scene is loaded,
 	// return without calling the path script