aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/objects.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-06-30 22:50:00 -0400
committerPaul Gilbert2015-06-30 22:50:00 -0400
commit6b3fe382ec70ac027bb87722fab0d7d612d42ea7 (patch)
treee6e806fa3af9a7128f5fbaddbebdac4d63343ad5 /engines/sherlock/objects.cpp
parentd2c4074fa65106e5e26f66cf9ce79fe6f5214da6 (diff)
downloadscummvm-rg350-6b3fe382ec70ac027bb87722fab0d7d612d42ea7.tar.gz
scummvm-rg350-6b3fe382ec70ac027bb87722fab0d7d612d42ea7.tar.bz2
scummvm-rg350-6b3fe382ec70ac027bb87722fab0d7d612d42ea7.zip
SHERLOCK: Change _lookPosition to use PositionFacing
Diffstat (limited to 'engines/sherlock/objects.cpp')
-rw-r--r--engines/sherlock/objects.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 0a4b7e92a9..1d2cb1b725 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -66,7 +66,6 @@ BaseObject::BaseObject() {
_aType = OBJECT;
_lookFrames = 0;
_seqCounter = 0;
- _lookFacing = 0;
_lookcAnim = 0;
_seqStack = 0;
_seqTo = 0;
@@ -986,7 +985,7 @@ void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
_lookPosition.x = s.readUint16LE() * FIXED_INT_MULTIPLIER / 100;
_lookPosition.y = s.readByte() * FIXED_INT_MULTIPLIER;
}
- _lookFacing = s.readByte();
+ _lookPosition._facing = s.readByte();
_lookcAnim = s.readByte();
if (!isRoseTattoo)
@@ -1113,7 +1112,7 @@ void Object::load3DO(Common::SeekableReadStream &s) {
// Unverified END
_lookPosition.y = s.readByte() * FIXED_INT_MULTIPLIER;
- _lookFacing = s.readByte();
+ _lookPosition._facing = s.readByte();
// Unverified
_lookcAnim = s.readByte();