aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-14 21:20:23 -0500
committerPaul Gilbert2017-02-14 21:20:23 -0500
commit01bea5a6d8c42c0b2fe16fe99ffc575c82caff57 (patch)
tree1f1a9f34ee097ac222ed27d83d8311a23fa7249d /engines/titanic/game
parentfb50d5934d982d5670233d0455f76cb73ccdaa27 (diff)
downloadscummvm-rg350-01bea5a6d8c42c0b2fe16fe99ffc575c82caff57.tar.gz
scummvm-rg350-01bea5a6d8c42c0b2fe16fe99ffc575c82caff57.tar.bz2
scummvm-rg350-01bea5a6d8c42c0b2fe16fe99ffc575c82caff57.zip
TITANIC: Fix opening/closing Phonograph cylinder holder
Diffstat (limited to 'engines/titanic/game')
-rw-r--r--engines/titanic/game/phonograph.cpp2
-rw-r--r--engines/titanic/game/restaurant_cylinder_holder.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/titanic/game/phonograph.cpp b/engines/titanic/game/phonograph.cpp
index f43bb3a60b..2b7bc98244 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 05f731d32d..8a2581b32b 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",