diff options
-rw-r--r-- | engines/hopkins/anim.cpp | 10 | ||||
-rw-r--r-- | engines/hopkins/anim.h | 2 | ||||
-rw-r--r-- | engines/hopkins/events.cpp | 2 | ||||
-rw-r--r-- | engines/hopkins/events.h | 1 | ||||
-rw-r--r-- | engines/hopkins/script.cpp | 4 |
5 files changed, 7 insertions, 12 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index e2980b3eae..d0186171d2 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -597,7 +597,7 @@ void AnimationManager::searchAnim(const byte *data, int animIndex, int bufSize) /** * Play sequence */ -void AnimationManager::playSequence(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3) { +void AnimationManager::playSequence(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3, bool skipEscFl) { bool readError; byte *screenCopy = NULL; byte *screenP; @@ -666,7 +666,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui if (_vm->_globals.iRegul == 1) { do { if (_vm->_eventsManager._escKeyFl) { - if (!_vm->_eventsManager._disableEscKeyFl) + if (!skipEscFl) skipFl = true; else _vm->_eventsManager._escKeyFl = false; @@ -687,7 +687,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui if (_vm->_globals.iRegul == 1) { do { if (_vm->_eventsManager._escKeyFl) { - if (!_vm->_eventsManager._disableEscKeyFl) + if (!skipEscFl) skipFl = true; else _vm->_eventsManager._escKeyFl = false; @@ -719,7 +719,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui if (_vm->_globals.iRegul == 1) { do { if (_vm->_eventsManager._escKeyFl) { - if (!_vm->_eventsManager._disableEscKeyFl) + if (!skipEscFl) skipFl = true; else _vm->_eventsManager._escKeyFl = false; @@ -756,7 +756,7 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui if (_vm->_globals.iRegul == 1 && !skipFl) { do { if (_vm->_eventsManager._escKeyFl) { - if (!_vm->_eventsManager._disableEscKeyFl) + if (!skipEscFl) skipFl = true; else _vm->_eventsManager._escKeyFl = false; diff --git a/engines/hopkins/anim.h b/engines/hopkins/anim.h index e89d2155b9..c0a62b711d 100644 --- a/engines/hopkins/anim.h +++ b/engines/hopkins/anim.h @@ -51,7 +51,7 @@ public: void clearAnim(); void playAnim(const Common::String &filename, uint32 rate1, uint32 rate2, uint32 rate3); void playAnim2(const Common::String &filename, uint32 rate1, uint32 rate2, uint32 rate3); - void playSequence(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3); + void playSequence(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3, bool skipEscFl = false); void playSequence2(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3); }; diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp index 98ce803e18..31b972cdc3 100644 --- a/engines/hopkins/events.cpp +++ b/engines/hopkins/events.cpp @@ -53,8 +53,6 @@ EventsManager::EventsManager() { Common::fill(&_keyState[0], &_keyState[256], false); _priorCounterTime = 0; _priorFrameTime = 0; - - _disableEscKeyFl = false; } EventsManager::~EventsManager() { diff --git a/engines/hopkins/events.h b/engines/hopkins/events.h index 28a4a9a2de..d6517906ed 100644 --- a/engines/hopkins/events.h +++ b/engines/hopkins/events.h @@ -62,7 +62,6 @@ public: uint32 _priorCounterTime; uint32 _priorFrameTime; bool _escKeyFl; - bool _disableEscKeyFl; DIALOG_KEY _gameKey; int _mouseCursorId; byte *_objectBuf; diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index b63490fb46..ba83b61725 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -1820,9 +1820,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_globals._disableInventFl = true; if (_vm->_globals._saveData->_data[svField6] != _vm->_globals._saveData->_data[svField401]) { _vm->_soundManager._specialSoundNum = 208; - _vm->_eventsManager._disableEscKeyFl = true; - _vm->_animationManager.playSequence("SORT.SEQ", 10, 4, 10); - _vm->_eventsManager._disableEscKeyFl = false; + _vm->_animationManager.playSequence("SORT.SEQ", 10, 4, 10, true); _vm->_soundManager._specialSoundNum = 0; } _vm->_globals.NOT_VERIF = true; |