diff options
author | Paul Gilbert | 2017-01-12 20:18:20 -0500 |
---|---|---|
committer | Paul Gilbert | 2017-01-12 20:18:20 -0500 |
commit | 92693a9ccd25f06608c21a907732f1a9c8fe82a2 (patch) | |
tree | ace5f386e45b2e89e2289076d76556338dc3a77b /engines | |
parent | 6e04b361b242a8c50ad4e5c7f757a00b167e27e3 (diff) | |
download | scummvm-rg350-92693a9ccd25f06608c21a907732f1a9c8fe82a2.tar.gz scummvm-rg350-92693a9ccd25f06608c21a907732f1a9c8fe82a2.tar.bz2 scummvm-rg350-92693a9ccd25f06608c21a907732f1a9c8fe82a2.zip |
TITANIC: Fixes for unlocking music system
Diffstat (limited to 'engines')
-rw-r--r-- | engines/titanic/core/game_object.cpp | 4 | ||||
-rw-r--r-- | engines/titanic/game/music_system_lock.cpp | 6 |
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); |