[Scummvm-git-logs] scummvm master -> 01bea5a6d8c42c0b2fe16fe99ffc575c82caff57

dreammaster dreammaster at scummvm.org
Wed Feb 15 03:20:29 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
01bea5a6d8 TITANIC: Fix opening/closing Phonograph cylinder holder


Commit: 01bea5a6d8c42c0b2fe16fe99ffc575c82caff57
    https://github.com/scummvm/scummvm/commit/01bea5a6d8c42c0b2fe16fe99ffc575c82caff57
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-14T21:20:23-05:00

Commit Message:
TITANIC: Fix opening/closing Phonograph cylinder holder

Changed paths:
    engines/titanic/game/phonograph.cpp
    engines/titanic/game/restaurant_cylinder_holder.cpp


diff --git a/engines/titanic/game/phonograph.cpp b/engines/titanic/game/phonograph.cpp
index f43bb3a..2b7bc98 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 05f731d..8a2581b 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",





More information about the Scummvm-git-logs mailing list