[Scummvm-cvs-logs] scummvm master -> d9ccf57dd019d4694efa4375b284a9a438a37908

dreammaster dreammaster at scummvm.org
Sat Jun 13 16:15:01 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:
d9ccf57dd0 SHERLOCK: RT: Fix getting default scene player position


Commit: d9ccf57dd019d4694efa4375b284a9a438a37908
    https://github.com/scummvm/scummvm/commit/d9ccf57dd019d4694efa4375b284a9a438a37908
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-13T10:13:53-04:00

Commit Message:
SHERLOCK: RT: Fix getting default scene player position

Changed paths:
    engines/sherlock/scene.cpp



diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 78c7acb..22a0e36 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -1031,8 +1031,13 @@ void Scene::transitionToScene() {
 			}
 		} else {
 			// setup entrance info
-			hSavedPos.x = _entrance._startPosition.x * FIXED_INT_MULTIPLIER / 100;
-			hSavedPos.y = _entrance._startPosition.y * FIXED_INT_MULTIPLIER / 100;
+			hSavedPos.x = _entrance._startPosition.x * FIXED_INT_MULTIPLIER;
+			hSavedPos.y = _entrance._startPosition.y * FIXED_INT_MULTIPLIER;
+			if (IS_SERRATED_SCALPEL) {
+				hSavedPos.x /= 100;
+				hSavedPos.y /= 100;
+			}
+
 			hSavedFacing = _entrance._startDir;
 		}
 	} else {






More information about the Scummvm-git-logs mailing list