From 98643109e1d29facee2508cf897ded3367614178 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 10 Jul 2015 18:50:36 -0400
Subject: SHERLOCK: RT: Don't run setNPCPath after loading a savegame

---
 engines/sherlock/tattoo/tattoo_scene.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index badc58d86f..0f61109c9d 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);
 
-- 
cgit v1.2.3