[Scummvm-cvs-logs] scummvm master -> 364a60801b361f3180538864c494fa3a24c9620a

dreammaster dreammaster at scummvm.org
Sun Aug 16 23:32:56 CEST 2015


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:
364a60801b SHERLOCK: RT: Fix occassional crash after loading savegames


Commit: 364a60801b361f3180538864c494fa3a24c9620a
    https://github.com/scummvm/scummvm/commit/364a60801b361f3180538864c494fa3a24c9620a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-16T17:32:18-04:00

Commit Message:
SHERLOCK: RT: Fix occassional crash after loading savegames

Changed paths:
    engines/sherlock/scene.cpp



diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index eaca780..b2fe0a2 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






More information about the Scummvm-git-logs mailing list