[Scummvm-cvs-logs] scummvm master -> 26bbfec72959c92e879e601499ab34d8dc1d1602

[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:
26bbfec729 SHERLOCK: Fix setting up default RT player position


Commit: 26bbfec72959c92e879e601499ab34d8dc1d1602
    https://github.com/scummvm/scummvm/commit/26bbfec72959c92e879e601499ab34d8dc1d1602
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-04T19:55:32-04:00

Commit Message:
SHERLOCK: Fix setting up default RT player position

Changed paths:
    engines/sherlock/people.cpp
    engines/sherlock/scene.cpp



diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index c33234d..e119235 100644
--- a/engines/sherlock/people.cpp
+++ b/engines/sherlock/people.cpp
@@ -127,9 +127,9 @@ void People::reset() {
 
 		p._type = (idx == 0) ? CHARACTER : INVALID;
 		if (IS_SERRATED_SCALPEL)
-			p._position = Point32(10000, 11000);
+			p._position = Point32(100 * FIXED_INT_MULTIPLIER, 110 * FIXED_INT_MULTIPLIER);
 		else
-			p._position = Point32(36000, 29000);
+			p._position = Point32(36 * FIXED_INT_MULTIPLIER, 29 * FIXED_INT_MULTIPLIER);
 
 		p._sequenceNumber = STOP_DOWNRIGHT;
 		p._imageFrame = nullptr;
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 9b953ff..064ac8d 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -757,8 +757,13 @@ void Scene::transitionToScene() {
 		// No exit information from last scene-check entrance info
 		if (_entrance._startPosition.x < 1) {
 			// No entrance info either, so use defaults
-			hSavedPos = Common::Point(16000, 10000);
-			hSavedFacing = 4;
+			if (IS_SERRATED_SCALPEL) {
+				hSavedPos = Common::Point(16000, 10000);
+				hSavedFacing = 4;
+			} else {
+				hSavedPos = people[PLAYER]._position;
+				hSavedFacing = people[PLAYER]._sequenceNumber;
+			}
 		} else {
 			// setup entrance info
 			hSavedPos = _entrance._startPosition;