TITANIC: Fixes for unlocking music system

scummvm · Jan 13, 2017 · 92693a9 · 92693a9
1 parent 6e04b36
commit 92693a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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);