diff options
| author | Paul Gilbert | 2015-06-04 19:55:32 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-04 19:55:32 -0400 |
| commit | 26bbfec72959c92e879e601499ab34d8dc1d1602 (patch) | |
| tree | 05fd364a0ceb5a3feed3399082a632c65ea6b16a /engines/sherlock | |
| parent | 2f707bf20723a72e769c872f433fbcb67f0dccdf (diff) | |
| download | scummvm-rg350-26bbfec72959c92e879e601499ab34d8dc1d1602.tar.gz scummvm-rg350-26bbfec72959c92e879e601499ab34d8dc1d1602.tar.bz2 scummvm-rg350-26bbfec72959c92e879e601499ab34d8dc1d1602.zip | |
SHERLOCK: Fix setting up default RT player position
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/people.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/scene.cpp | 9 |
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; |