thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: Add some checks to quit the game quickly when closing ScummVM

Browse source
This commit is contained in:
Strangerke 2015-12-16 00:07:31 +01:00 • committed by Willem Jan Palenstijn
parent 3f1bb66959
commit eab6682929
4 changed files with 40 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
engines/lab/engine.cpp
View file

@ -188,7 +188,7 @@ void LabEngine::eatMessages() {
do {
msg = _event->getMsg();
} while (msg);
} while (msg && !g_engine->shouldQuit());
}
/**
@ -527,6 +527,10 @@ void LabEngine::mainGameLoop() {
_music->updateMusic();
interfaceOn();
IntuiMessage *curMsg = _event->getMsg();
if (g_engine->shouldQuit()) {
_quitLab = true;
return;
}
if (!curMsg) {
// Does music load and next animation frame when you've run out of messages
@ -632,6 +636,9 @@ bool LabEngine::fromCrumbs(uint32 tmpClass, uint16 code, uint16 qualifier, Commo
_anim->_doBlack = false;
if (g_engine->shouldQuit())
return false;
if ((msgClass == RAWKEY) && (!_graphics->_longWinInFront)) {
if (!processKey(curMsg, msgClass, qualifier, curPos, curInv, forceDraw, code))
return false;
@ -856,21 +863,22 @@ bool LabEngine::processKey(IntuiMessage *curMsg, uint32 &msgClass, uint16 &quali
_music->updateMusic();
curMsg = _event->getMsg();
if (g_engine->shouldQuit())
return false;
if (!curMsg) {
// Does music load and next animation frame when you've run out of messages
_music->updateMusic();
_anim->diffNextFrame();
} else {
if (curMsg->_msgClass == RAWKEY) {
codeLower = tolower(curMsg->_code);
if (codeLower == 'y' || codeLower == 'q') {
_anim->stopDiff();
return false;
} else if (curMsg->_code < 128)
break;
} else if (curMsg->_msgClass == MOUSEBUTTONS)
} else if (curMsg->_msgClass == RAWKEY) {
codeLower = tolower(curMsg->_code);
if (codeLower == 'y' || codeLower == 'q') {
_anim->stopDiff();
return false;
} else if (curMsg->_code < 128)
break;
}
} else if (curMsg->_msgClass == MOUSEBUTTONS)
break;
}
forceDraw = true;