libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HOPKINS: Remove duplicated code in AnimationManager.

Browse Source 
"noColFl" is only 'true' in one animation of the full game, so the code after the check isn't used in the demo.
This commit is contained in:
Strangerke 2013-03-23 15:00:55 +01:00
parent a6a8f1afd8
commit 38a90947fe
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engines/hopkins/anim.cpp
View File

@ -660,40 +660,22 @@ void AnimationManager::playSequence(const Common::String &file, uint32 rate1, ui
_vm->_graphicsManager->updateScreen(); _vm->_graphicsManager->updateScreen();
} }
bool skipFl = false; bool skipFl = false;
if (_vm->getIsDemo()) { if (noColFl)
_vm->_eventsManager->_rateCounter = 0; _vm->_graphicsManager->fadeInDefaultLength(screenP);
_vm->_eventsManager->_escKeyFl = false; _vm->_eventsManager->_rateCounter = 0;
_vm->_soundManager->loadAnimSound(); _vm->_eventsManager->_escKeyFl = false;
if (_vm->_globals->iRegul == 1) { _vm->_soundManager->loadAnimSound();
do { if (_vm->_globals->iRegul == 1) {
if (_vm->shouldQuit() || (_vm->_eventsManager->_escKeyFl && !skipEscFl)) { do {
skipFl = true; if (_vm->shouldQuit() || (_vm->_eventsManager->_escKeyFl && !skipEscFl)) {
break; skipFl = true;
} break;
}
_vm->_eventsManager->_escKeyFl = false; _vm->_eventsManager->_escKeyFl = false;
_vm->_eventsManager->refreshEvents(); _vm->_eventsManager->refreshEvents();
_vm->_soundManager->checkSoundEnd(); _vm->_soundManager->checkSoundEnd();
} while (_vm->_eventsManager->_rateCounter < rate1); } while (_vm->_eventsManager->_rateCounter < rate1);
}
} else {
if (noColFl)
_vm->_graphicsManager->fadeInDefaultLength(screenP);
_vm->_eventsManager->_rateCounter = 0;
_vm->_eventsManager->_escKeyFl = false;
_vm->_soundManager->loadAnimSound();
if (_vm->_globals->iRegul == 1) {
do {
if (_vm->shouldQuit() || (_vm->_eventsManager->_escKeyFl && !skipEscFl)) {
skipFl = true;
break;
}
_vm->_eventsManager->_escKeyFl = false;
_vm->_eventsManager->refreshEvents();
_vm->_soundManager->checkSoundEnd();
} while (_vm->_eventsManager->_rateCounter < rate1);
}
} }
_vm->_eventsManager->_rateCounter = 0; _vm->_eventsManager->_rateCounter = 0;
if (!skipFl) { if (!skipFl) {