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 +++++++--
engines/sherlock/tattoo/tattoo_user_interface.cpp | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
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();
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 79a6eaf240..7de78457c6 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -108,7 +108,7 @@ void TattooUserInterface::lookAtObject() {
name.deleteLastChar();
// See if this Object Sound List entry matches the object's name
- if (_bgShape->_name.compareToIgnoreCase(name)) {
+ if (!_bgShape->_name.compareToIgnoreCase(name)) {
// Move forward to get the sound filename
while ((*p == ' ') || (*p == '='))
++p;
--
cgit v1.2.3