aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/sherlock/people.cpp4
-rw-r--r--engines/sherlock/scene.cpp9
2 files changed, 9 insertions, 4 deletions
diff --git a/engines/sherlock/people.cpp b/engines/sherlock/people.cpp
index c33234d375..e119235165 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 9b953ffcfd..064ac8d67e 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;