From d2c4074fa65106e5e26f66cf9ce79fe6f5214da6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 30 Jun 2015 21:18:26 -0400
Subject: SHERLOCK: RT: Fix incorrectly playing sounds when looking at objects

---
 engines/sherlock/objects.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines/sherlock/objects.cpp')

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 97d63c5da6..0a4b7e92a9 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -979,8 +979,13 @@ void Object::load(Common::SeekableReadStream &s, bool isRoseTattoo) {
 	_aType = (AType)s.readByte();
 	_lookFrames = s.readByte();
 	_seqCounter = s.readByte();
-	_lookPosition.x = s.readUint16LE() * FIXED_INT_MULTIPLIER / 100;
-	_lookPosition.y = (isRoseTattoo ? s.readSint16LE() : s.readByte()) * FIXED_INT_MULTIPLIER;
+	if (isRoseTattoo) {
+		_lookPosition.x = s.readUint16LE() * FIXED_INT_MULTIPLIER;
+		_lookPosition.y = s.readSint16LE() * FIXED_INT_MULTIPLIER;
+	} else {
+		_lookPosition.x = s.readUint16LE() * FIXED_INT_MULTIPLIER / 100;
+		_lookPosition.y = s.readByte() * FIXED_INT_MULTIPLIER;
+	}
 	_lookFacing = s.readByte();
 	_lookcAnim = s.readByte();
 
-- 
cgit v1.2.3