From 01bea5a6d8c42c0b2fe16fe99ffc575c82caff57 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 14 Feb 2017 21:20:23 -0500 Subject: [PATCH] TITANIC: Fix opening/closing Phonograph cylinder holder --- engines/titanic/game/phonograph.cpp | 2 +- engines/titanic/game/restaurant_cylinder_holder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/titanic/game/phonograph.cpp b/engines/titanic/game/phonograph.cpp index f43bb3a60b6..2b7bc98244a 100644 --- a/engines/titanic/game/phonograph.cpp +++ b/engines/titanic/game/phonograph.cpp @@ -83,7 +83,7 @@ bool CPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) { _isPlaying = true; msg->_value = 1; } else { - stopGlobalSound(0, -1); + stopGlobalSound(false, -1); playGlobalSound(cylinderMsg._name, -2, true, true, 0); _isPlaying = true; msg->_value = 1; diff --git a/engines/titanic/game/restaurant_cylinder_holder.cpp b/engines/titanic/game/restaurant_cylinder_holder.cpp index 05f731d32d1..8a2581b32b6 100644 --- a/engines/titanic/game/restaurant_cylinder_holder.cpp +++ b/engines/titanic/game/restaurant_cylinder_holder.cpp @@ -66,7 +66,7 @@ void CRestaurantCylinderHolder::load(SimpleFile *file) { bool CRestaurantCylinderHolder::EjectCylinderMsg(CEjectCylinderMsg *msg) { _field11C = true; - bool hasCylinder = findByName("Phonograph Cylinder") != nullptr; + bool hasCylinder = findByName("Phonograph Cylinder", true) != nullptr; if (_isOpen) { playClip(hasCylinder ? "CloseHolder_Full" : "CloseHolder_Empty",