diff options
| author | Paul Gilbert | 2015-07-10 18:50:36 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-07-10 18:50:36 -0400 |
| commit | 98643109e1d29facee2508cf897ded3367614178 (patch) | |
| tree | b1d72f4bc49d31df37f8e7f15adebd984697b4fe /engines/sherlock/tattoo | |
| parent | 5a297977354290af496179215d60848a78af8001 (diff) | |
| download | scummvm-rg350-98643109e1d29facee2508cf897ded3367614178.tar.gz scummvm-rg350-98643109e1d29facee2508cf897ded3367614178.tar.bz2 scummvm-rg350-98643109e1d29facee2508cf897ded3367614178.zip | |
SHERLOCK: RT: Don't run setNPCPath after loading a savegame
Diffstat (limited to 'engines/sherlock/tattoo')
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_scene.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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); |