[Scummvm-cvs-logs] scummvm master -> 98643109e1d29facee2508cf897ded3367614178

[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:
98643109e1 SHERLOCK: RT: Don't run setNPCPath after loading a savegame


Commit: 98643109e1d29facee2508cf897ded3367614178
    https://github.com/scummvm/scummvm/commit/98643109e1d29facee2508cf897ded3367614178
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-07-10T18:50:36-04:00

Commit Message:
SHERLOCK: RT: Don't run setNPCPath after loading a savegame

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 badc58d..0f61109 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -689,8 +689,13 @@ int TattooScene::startCAnim(int cAnimNum, int playRate) {
 
 void TattooScene::setNPCPath(int npc) {
 	TattooPeople &people = *(TattooPeople *)_vm->_people;
+	SaveManager &saves = *_vm->_saves;
 	Talk &talk = *_vm->_talk;
 
+	// Don't do initial scene setup if a savegame has just been loaded
+	if (saves._justLoaded)
+		return;
+
 	people[npc].clearNPC();
 	people[npc]._name = Common::String::format("WATS%.2dA", _currentScene);