aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/titanic/core/game_object.cpp4
-rw-r--r--engines/titanic/game/music_system_lock.cpp6
2 files changed, 8 insertions, 2 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 0a0b3b1c42..3e1cb0858c 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 074864e7c3..e28882f600 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);