diff options
| author | Paul Gilbert | 2015-08-16 17:32:18 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-16 17:32:18 -0400 |
| commit | 364a60801b361f3180538864c494fa3a24c9620a (patch) | |
| tree | 9f77355493492bbe32b30c9d17e5f7ca0a2f9bd5 | |
| parent | 40a5c7881c9b8a665eba67c0f0f27cbb8e1bc0f4 (diff) | |
| download | scummvm-rg350-364a60801b361f3180538864c494fa3a24c9620a.tar.gz scummvm-rg350-364a60801b361f3180538864c494fa3a24c9620a.tar.bz2 scummvm-rg350-364a60801b361f3180538864c494fa3a24c9620a.zip | |
SHERLOCK: RT: Fix occassional crash after loading savegames
| -rw-r--r-- | engines/sherlock/scene.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp index eaca780d40..b2fe0a2a45 100644 --- a/engines/sherlock/scene.cpp +++ b/engines/sherlock/scene.cpp @@ -1200,13 +1200,15 @@ void Scene::transitionToScene() { int cAnimNum = -1; - if (hSavedFacing < 101) { - // Standard info, so set it - people[HOLMES]._position = hSavedPos; - people[HOLMES]._sequenceNumber = hSavedFacing; - } else { - // It's canimation information - cAnimNum = hSavedFacing - 101; + if (!saves._justLoaded) { + if (hSavedFacing < 101) { + // Standard info, so set it + people[HOLMES]._position = hSavedPos; + people[HOLMES]._sequenceNumber = hSavedFacing; + } else { + // It's canimation information + cAnimNum = hSavedFacing - 101; + } } // Reset positioning for next load |