libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-21 01:08:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HOPKINS: Fix the Esc key behavior in playSequence, remove several GOTOs

Browse Source
This commit is contained in:
Strangerke 2013-02-03 22:28:38 +01:00
parent 49afc87b88
commit cec23051b3
2 changed files with 73 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
engines/hopkins/anim.cpp
View File

@ -606,6 +606,8 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
size_t nbytes;
Common::File f;
bool skipFl = false;
if (_vm->shouldQuit())
return;
@ -665,9 +667,13 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
do {
if (_vm->_eventsManager._escKeyFl) {
if (!_vm->_eventsManager._disableEscKeyFl)
goto LABEL_59;
_vm->_eventsManager._escKeyFl = false;
skipFl = true;
else
_vm->_eventsManager._escKeyFl = false;
}
if (skipFl)
break;
_vm->_eventsManager.refreshEvents();
_vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate1);
@ -682,9 +688,14 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
do {
if (_vm->_eventsManager._escKeyFl) {
if (!_vm->_eventsManager._disableEscKeyFl)
goto LABEL_59;
_vm->_eventsManager._escKeyFl = false;
skipFl = true;
else
_vm->_eventsManager._escKeyFl = false;
}
if (skipFl)
break;
_vm->_eventsManager.refreshEvents();
_vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate1);
@ -693,57 +704,73 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
_vm->_eventsManager._rateCounter = 0;
readError = false;
soundNumber = 0;
do {
++soundNumber;
_vm->_soundManager.playAnimSound(soundNumber);
memset(v10, 0, 19);
if (f.read(v10, 16) != 16)
readError = true;
if (!skipFl) {
do {
++soundNumber;
_vm->_soundManager.playAnimSound(soundNumber);
memset(v10, 0, 19);
if (f.read(v10, 16) != 16)
readError = true;
if (strncmp((const char *)v10, "IMAGE=", 6))
readError = true;
if (!readError) {
f.read(screenP, READ_LE_UINT32(v10 + 8));
if (_vm->_globals.iRegul == 1) {
do {
if (_vm->_eventsManager._escKeyFl) {
if (!_vm->_eventsManager._disableEscKeyFl)
goto LABEL_59;
_vm->_eventsManager._escKeyFl = false;
}
_vm->_eventsManager.refreshEvents();
_vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate2);
}
_vm->_eventsManager._rateCounter = 0;
_vm->_graphicsManager.lockScreen();
if (hasScreenCopy) {
if (*screenP != kByteStop) {
_vm->_graphicsManager.Copy_WinScan_Vbe(screenP, screenCopy);
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
if (strncmp((const char *)v10, "IMAGE=", 6))
readError = true;
if (!readError) {
f.read(screenP, READ_LE_UINT32(v10 + 8));
if (_vm->_globals.iRegul == 1) {
do {
if (_vm->_eventsManager._escKeyFl) {
if (!_vm->_eventsManager._disableEscKeyFl)
skipFl = true;
else
_vm->_eventsManager._escKeyFl = false;
}
if (skipFl)
break;
_vm->_eventsManager.refreshEvents();
_vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate2);
}
} else if (*screenP != kByteStop) {
_vm->_graphicsManager.Copy_Video_Vbe16a(screenP);
}
_vm->_graphicsManager.unlockScreen();
_vm->_graphicsManager.DD_VBL();
_vm->_soundManager.checkSoundEnd();
}
} while (!readError);
if (_vm->_globals.iRegul == 1) {
if (skipFl)
break;
_vm->_eventsManager._rateCounter = 0;
_vm->_graphicsManager.lockScreen();
if (hasScreenCopy) {
if (*screenP != kByteStop) {
_vm->_graphicsManager.Copy_WinScan_Vbe(screenP, screenCopy);
_vm->_graphicsManager.m_scroll16A(screenCopy, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0);
}
} else if (*screenP != kByteStop) {
_vm->_graphicsManager.Copy_Video_Vbe16a(screenP);
}
_vm->_graphicsManager.unlockScreen();
_vm->_graphicsManager.DD_VBL();
_vm->_soundManager.checkSoundEnd();
}
} while (!readError);
}
if (_vm->_globals.iRegul == 1 && !skipFl) {
do {
if (_vm->_eventsManager._escKeyFl) {
if (!_vm->_eventsManager._disableEscKeyFl)
goto LABEL_59;
_vm->_eventsManager._escKeyFl = false;
skipFl = true;
else
_vm->_eventsManager._escKeyFl = false;
}
if (skipFl)
break;
_vm->_eventsManager.refreshEvents();
_vm->_soundManager.checkSoundEnd();
} while (_vm->_eventsManager._rateCounter < rate3);
}
_vm->_eventsManager._rateCounter = 0;
LABEL_59:
if (!skipFl)
_vm->_eventsManager._rateCounter = 0;
_vm->_graphicsManager._skipVideoLockFl = false;
f.close();

2
engines/hopkins/events.cpp
View File

@ -53,6 +53,8 @@ EventsManager::EventsManager() {
Common::fill(&_keyState[0], &_keyState[256], false);
_priorCounterTime = 0;
_priorFrameTime = 0;
_disableEscKeyFl = false;
}
EventsManager::~EventsManager() {