[Scummvm-git-logs] scummvm master -> 92693a9ccd25f06608c21a907732f1a9c8fe82a2

[dreammaster]

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:
92693a9ccd TITANIC: Fixes for unlocking music system


Commit: 92693a9ccd25f06608c21a907732f1a9c8fe82a2
    https://github.com/scummvm/scummvm/commit/92693a9ccd25f06608c21a907732f1a9c8fe82a2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-12T20:18:20-05:00

Commit Message:
TITANIC: Fixes for unlocking music system

Changed paths:
    engines/titanic/core/game_object.cpp
    engines/titanic/game/music_system_lock.cpp


diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 0a0b3b1..3e1cb08 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -548,6 +548,10 @@ void CGameObject::sound8(bool flag) const {
 }
 
 void CGameObject::setVisible(bool val) {
+	if (_name.contains("ylinder")) {
+		warning("TODO");
+	}
+
 	if (val != _visible) {
 		_visible = val;
 		makeDirty();
diff --git a/engines/titanic/game/music_system_lock.cpp b/engines/titanic/game/music_system_lock.cpp
index 074864e..e28882f 100644
--- a/engines/titanic/game/music_system_lock.cpp
+++ b/engines/titanic/game/music_system_lock.cpp
@@ -50,14 +50,16 @@ bool CMusicSystemLock::DropObjectMsg(CDropObjectMsg *msg) {
 		playMovie(MOVIE_NOTIFY_OBJECT);
 	}
 
-	return true;
+	return false;
 }
 
 bool CMusicSystemLock::MovieEndMsg(CMovieEndMsg *msg) {
 	CTreeItem *phonograph = findRoom()->findByName("Restaurant Phonograph");
+
+	// Toggle the locked status of the music system
 	CQueryPhonographState queryMsg;
 	queryMsg.execute(phonograph);
-	CLockPhonographMsg lockMsg(queryMsg._value);
+	CLockPhonographMsg lockMsg(!queryMsg._value);
 	lockMsg.execute(phonograph, nullptr, MSGFLAG_SCAN);
 
 	setVisible(false);