[Scummvm-cvs-logs] scummvm master -> 9a6a65a9659325ef636fd2ac50e5094b0a85c19c

[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:
9a6a65a965 SHERLOCK: SS: Don't reset Holme's position when loading savegames


Commit: 9a6a65a9659325ef636fd2ac50e5094b0a85c19c
    https://github.com/scummvm/scummvm/commit/9a6a65a9659325ef636fd2ac50e5094b0a85c19c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-10-10T18:27:47-04:00

Commit Message:
SHERLOCK: SS: Don't reset Holme's position when loading savegames

Changed paths:
    engines/sherlock/people.cpp



diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index 09dba25..8057e26 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -185,7 +185,8 @@ void People::reset() {
 
 		if (IS_SERRATED_SCALPEL) {
 			p._type = _holmesOn ? CHARACTER : HIDDEN;
-			p._position = Point32(100 * FIXED_INT_MULTIPLIER, 110 * FIXED_INT_MULTIPLIER);
+			if (!saves._justLoaded)
+				p._position = Point32(100 * FIXED_INT_MULTIPLIER, 110 * FIXED_INT_MULTIPLIER);
 		} else if (!talk._scriptMoreFlag && !saves._justLoaded) {
 			p._type = (idx == 0) ? CHARACTER : INVALID;
 			p._position = Point32(36 * FIXED_INT_MULTIPLIER, 29 * FIXED_INT_MULTIPLIER);