ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ADL: Disable GMM restore on restart prompt

Browse Source 
At the end of the game a restart command is executed
from the global command list. As we assumed that this
would not occur, we disable restoring on the restart
prompt, at least for now.
This commit is contained in:
Walter van Niftrik
2016-03-09 10:03:13 +01:00
parent 349245d9b4
commit ce3af91ef8
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/adl/adl.cpp
-16
View File
@@ -946,16 +946,7 @@ void AdlEngine::doActions(const Command &command, byte noun, byte offset) {
break;
case IDO_ACT_RESTART: {
_display->printString(_strings.playAgain);
// We allow restoring via GMM here
_canRestoreNow = true;
Common::String input = inputString();
_canRestoreNow = false;
// If the user restored with the GMM, we break off the restart
if (_isRestoring)
return;
if (input.size() == 0 || input[0] != APPLECHAR('N')) {
_isRestarting = true;
_display->clear(0x00);
@@ -1036,18 +1027,11 @@ bool AdlEngine::doOneCommand(const Commands &commands, byte verb, byte noun) {
void AdlEngine::doAllCommands(const Commands &commands, byte verb, byte noun) {
Commands::const_iterator cmd;
bool oldIsRestoring = _isRestoring;
for (cmd = commands.begin(); cmd != commands.end(); ++cmd) {
uint offset = 0;
if (matchCommand(*cmd, verb, noun, &offset))
doActions(*cmd, noun, offset);
// We assume no restarts happen in this command group. This
// simplifies enabling GMM savegame loading on the restart
// prompt.
if (_isRestarting || _isRestoring != oldIsRestoring)
error("Unexpected restart action encountered");
}
}