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

ADL: Use a quit flag instead of calling quitGame()

Browse source 
This makes the game quit promptly instead of waiting for the quit event to
come through the pipeline.
This commit is contained in:
Walter van Niftrik 2016-11-10 14:15:38 +01:00
parent 156d1f7221
commit 2a62adc1e0
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/adl/adl.cpp
View file

@ -58,6 +58,7 @@ AdlEngine::AdlEngine(OSystem *syst, const AdlGameDescription *gd) :
_graphics(nullptr),
_isRestarting(false),
_isRestoring(false),
_isQuitting(false),
_skipOneCommand(false),
_gameDescription(gd),
_saveVerb(0),
@ -553,7 +554,7 @@ Common::Error AdlEngine::run() {
_display->setMode(DISPLAY_MODE_MIXED);
while (1) {
while (!_isQuitting) {
uint verb = 0, noun = 0;
_isRestarting = false;
@ -1101,7 +1102,8 @@ int AdlEngine::o1_quit(ScriptEnv &e) {
OP_DEBUG_0("\tQUIT_GAME()");
printMessage(_messageIds.thanksForPlaying);
quitGame();
// We use _isRestarting to abort the current game loop iteration
_isQuitting = _isRestarting = true;
return -1;
}