diff options
Diffstat (limited to 'engines/hopkins/anim.cpp')
| -rw-r--r-- | engines/hopkins/anim.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index 95384ebe2d..3364429723 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -98,7 +98,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui _vm->_events->_escKeyFl = false; _vm->_soundMan->loadAnimSound(); - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { // Do pre-animation delay do { if (_vm->_events->_escKeyFl) @@ -125,7 +125,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui f.read(screenP, READ_LE_UINT32(imageStr + 8)); - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { do { if (_vm->_events->_escKeyFl) break; @@ -147,7 +147,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui } } - if (_vm->_globals->_eventMode == 1 && !_vm->_events->_escKeyFl) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE && !_vm->_events->_escKeyFl) { // Do post-animation delay do { if (_vm->_events->_escKeyFl) @@ -247,7 +247,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u _vm->_events->_rateCounter = 0; _vm->_events->_escKeyFl = false; _vm->_soundMan->loadAnimSound(); - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { while (!_vm->_events->_escKeyFl && _vm->_events->_rateCounter < rate1) { _vm->_events->refreshEvents(); } @@ -272,7 +272,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u break; f.read(screenP, READ_LE_UINT32(imageStr + 8)); - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { while (!_vm->_events->_escKeyFl && _vm->_events->_rateCounter < rate2) { _vm->_events->refreshEvents(); _vm->_soundMan->checkSoundEnd(); @@ -288,7 +288,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u _vm->_soundMan->checkSoundEnd(); } - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { while (!_vm->_events->_escKeyFl && _vm->_events->_rateCounter < rate3) { _vm->_events->refreshEvents(); _vm->_soundMan->checkSoundEnd(); @@ -588,7 +588,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui _vm->_events->_rateCounter = 0; _vm->_events->_escKeyFl = false; _vm->_soundMan->loadAnimSound(); - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { do { if (_vm->shouldQuit() || (_vm->_events->_escKeyFl && !skipEscFl)) { skipFl = true; @@ -615,7 +615,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui break; f.read(screenP, READ_LE_UINT32(imageStr + 8)); - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { do { if (_vm->shouldQuit() || (_vm->_events->_escKeyFl && !skipEscFl)) { skipFl = true; @@ -641,7 +641,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui } } - if (_vm->_globals->_eventMode == 1 && !skipFl) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE && !skipFl) { do { if (_vm->shouldQuit() || (_vm->_events->_escKeyFl && !skipEscFl)) { skipFl = true; @@ -704,7 +704,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u _vm->_events->_rateCounter = 0; _vm->_events->_escKeyFl = false; _vm->_soundMan->loadAnimSound(); - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { do { _vm->_events->refreshEvents(); _vm->_soundMan->checkSoundEnd(); @@ -728,7 +728,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u break; f.read(screenP, READ_LE_UINT32(imageStr + 8)); - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { do { _vm->_events->refreshEvents(); } while (!_vm->shouldQuit() && !_vm->_events->_escKeyFl && _vm->_events->_rateCounter < rate2); @@ -744,7 +744,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u } } - if (_vm->_globals->_eventMode == 1) { + if (_vm->_globals->_eventMode == EVENTMODE_IGNORE) { // Wait for third rate delay do { _vm->_events->refreshEvents(); |