[Scummvm-cvs-logs] scummvm master -> 993b7af3559fa93b3f3bae44346f599a6527c512
dreammaster
dreammaster at scummvm.org
Sat Jun 6 04:29:03 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:
993b7af355 SHERLOCK: Fix movement in adjustObject
Commit: 993b7af3559fa93b3f3bae44346f599a6527c512
https://github.com/scummvm/scummvm/commit/993b7af3559fa93b3f3bae44346f599a6527c512
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-05T22:27:54-04:00
Commit Message:
SHERLOCK: Fix movement in adjustObject
Changed paths:
engines/sherlock/objects.cpp
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 0e8eb30..1cfde29 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -1272,10 +1272,8 @@ void Object::adjustObject() {
if (_type == REMOVE)
return;
- // Move the object's position
- _position += _delta;
-
if (IS_ROSE_TATTOO && (_delta.x || _delta.y)) {
+ // The shape position is in pixels, and the delta is in fixed integer amounts
int t;
_noShapeSize.x += _delta.x;
t = _noShapeSize.x / (FIXED_INT_MULTIPLIER / 10);
@@ -1286,6 +1284,9 @@ void Object::adjustObject() {
t = _noShapeSize.y / (FIXED_INT_MULTIPLIER / 10);
_noShapeSize.y -= t * (FIXED_INT_MULTIPLIER / 10);
_position.y += t;
+ } else if (IS_SERRATED_SCALPEL) {
+ // The delta is in whole pixels, so simply adjust the position with it
+ _position += _delta;
}
if (_position.y > LOWER_LIMIT)
More information about the Scummvm-git-logs
mailing list