diff options
author | Paul Gilbert | 2017-02-13 21:46:12 -0500 |
---|---|---|
committer | Paul Gilbert | 2017-02-13 21:46:12 -0500 |
commit | 534ec946dd3448e71956cee54bdc40f26bb976f7 (patch) | |
tree | b80ed1ff52cba0eb8ab3d86f024986946fecdcfb /engines/titanic/game/restaurant_phonograph.cpp | |
parent | 7886ca6a4f9da6a8b974359371387347e3853b14 (diff) | |
download | scummvm-rg350-534ec946dd3448e71956cee54bdc40f26bb976f7.tar.gz scummvm-rg350-534ec946dd3448e71956cee54bdc40f26bb976f7.tar.bz2 scummvm-rg350-534ec946dd3448e71956cee54bdc40f26bb976f7.zip |
TITANIC: Some phonograph cleanup, fix record button
Diffstat (limited to 'engines/titanic/game/restaurant_phonograph.cpp')
-rw-r--r-- | engines/titanic/game/restaurant_phonograph.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/game/restaurant_phonograph.cpp b/engines/titanic/game/restaurant_phonograph.cpp index 881079e020..22f86dc8ab 100644 --- a/engines/titanic/game/restaurant_phonograph.cpp +++ b/engines/titanic/game/restaurant_phonograph.cpp @@ -60,14 +60,14 @@ void CRestaurantPhonograph::load(SimpleFile *file) { } bool CRestaurantPhonograph::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - if (!_fieldF8 && !_fieldE0) { + if (!_fieldF8 && !_isPlaying) { CQueryCylinderHolderMsg holderMsg; holderMsg.execute(this); - if (!holderMsg._value1) { + if (!holderMsg._isOpen) { CPhonographPlayMsg playMsg; playMsg.execute(this); - } else if (holderMsg._value2) { + } else if (holderMsg._isPresent) { CEjectCylinderMsg ejectMsg; ejectMsg.execute(this); @@ -83,7 +83,7 @@ bool CRestaurantPhonograph::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { } bool CRestaurantPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) { - if (_fieldE0) { + if (_isPlaying) { if (findView() == getView() && (!_fieldE8 || !_field114)) { loadFrame(_fieldEC); playSound(_ejectSoundName); @@ -101,10 +101,10 @@ bool CRestaurantPhonograph::PhonographPlayMsg(CPhonographPlayMsg *msg) { } bool CRestaurantPhonograph::PhonographStopMsg(CPhonographStopMsg *msg) { - bool flag = _fieldE0; + bool flag = _isPlaying; CPhonograph::PhonographStopMsg(msg); - if (_fieldE0) { + if (_isPlaying) { loadFrame(_fieldF0); if (flag) playSound(_string3); @@ -126,7 +126,7 @@ bool CRestaurantPhonograph::PhonographReadyToPlayMsg(CPhonographReadyToPlayMsg * } bool CRestaurantPhonograph::EjectCylinderMsg(CEjectCylinderMsg *msg) { - if (_fieldE0) { + if (_isPlaying) { CPhonographStopMsg stopMsg; stopMsg.execute(this); } |