diff options
| author | Paul Gilbert | 2017-02-16 23:37:27 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-02-16 23:37:27 -0500 |
| commit | 46076c0ac5cbc132ddc57c15469d3b9cee56fd56 (patch) | |
| tree | a0be56f9f900a47c921f7c0a32f84ac7df80be0f /engines/titanic/game/restaurant_phonograph.cpp | |
| parent | cb9ebfcb1c1e96194d6e9389b61b7cb802f0b7a6 (diff) | |
| download | scummvm-rg350-46076c0ac5cbc132ddc57c15469d3b9cee56fd56.tar.gz scummvm-rg350-46076c0ac5cbc132ddc57c15469d3b9cee56fd56.tar.bz2 scummvm-rg350-46076c0ac5cbc132ddc57c15469d3b9cee56fd56.zip | |
TITANIC: Fix operation of Phonograph play button
Diffstat (limited to 'engines/titanic/game/restaurant_phonograph.cpp')
| -rw-r--r-- | engines/titanic/game/restaurant_phonograph.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/engines/titanic/game/restaurant_phonograph.cpp b/engines/titanic/game/restaurant_phonograph.cpp index a2c8892201..693cf3d76e 100644 --- a/engines/titanic/game/restaurant_phonograph.cpp +++ b/engines/titanic/game/restaurant_phonograph.cpp @@ -73,7 +73,7 @@ bool CRestaurantPhonograph::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { _isDisabled = true; if (_field114) { - loadFrame(_fieldEC); + loadFrame(_playUnpressedFrame); playSound(_ejectSoundName); } } @@ -83,9 +83,11 @@ bool CRestaurantPhonograph::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CRestaurantPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) { + CPhonograph::PhonographPlayMsg(msg); + if (_isPlaying) { if (findView() == getView() && (!_isDisabled || !_field114)) { - loadFrame(_fieldEC); + loadFrame(_playUnpressedFrame); playSound(_ejectSoundName); } @@ -94,7 +96,7 @@ bool CRestaurantPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) { CRestaurantMusicChanged musicMsg(nameMsg._name); musicMsg.execute(findRoom()); } else { - loadFrame(_fieldF0); + loadFrame(_playPressedFrame); } return true; @@ -105,11 +107,11 @@ bool CRestaurantPhonograph::PhonographStopMsg(CPhonographStopMsg *msg) { CPhonograph::PhonographStopMsg(msg); if (_isPlaying) { - loadFrame(_fieldF0); + loadFrame(_playUnpressedFrame); + } else { + loadFrame(_playPressedFrame); if (flag) playSound(_stopSoundName); - } else { - loadFrame(_fieldEC); } return true; |