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

ADL: Fix regression in GMM saving/loading

Browse Source
This commit is contained in:
Walter van Niftrik 2016-03-08 15:09:52 +01:00
parent 9d65f901d0
commit 349245d9b4
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/adl/adl.cpp
View File

@ -302,8 +302,11 @@ Common::Error AdlEngine::run() {
if (shouldQuit())
break;
if (!doOneCommand(_roomCommands, verb, noun))
printMessage(_messageIds.dontUnderstand);
// If we just restored from the GMM, we skip this command
// set, as no command has been input by the user
if (!_isRestoring)
if (!doOneCommand(_roomCommands, verb, noun))
printMessage(_messageIds.dontUnderstand);
}
if (_isRestoring) {
@ -419,7 +422,7 @@ Common::Error AdlEngine::loadGameState(int slot) {
return Common::kNoError;
}
bool AdlEngine::canLoadGameStateCurrently() const {
bool AdlEngine::canLoadGameStateCurrently() {
return _canRestoreNow;
}
@ -496,7 +499,7 @@ Common::Error AdlEngine::saveGameState(int slot, const Common::String &desc) {
return Common::kNoError;
}
bool AdlEngine::canSaveGameStateCurrently() const {
bool AdlEngine::canSaveGameStateCurrently() {
if (!_canSaveNow)
return false;
@ -506,11 +509,9 @@ bool AdlEngine::canSaveGameStateCurrently() const {
// "SAVE GAME". This prevents saving via the GMM in situations where
// it wouldn't otherwise be possible to do so.
for (cmd = _roomCommands.begin(); cmd != _roomCommands.end(); ++cmd) {
if (matchCommand(*cmd, _saveVerb, _saveNoun)) {
if (cmd->verb != _saveVerb || cmd->noun != _saveNoun)
return false;
return cmd->numCond == 0 && cmd->script[0] == IDO_ACT_SAVE;
}
uint offset;
if (matchCommand(*cmd, _saveVerb, _saveNoun, &offset))
return cmd->script[offset] == IDO_ACT_SAVE;
}
return false;
@ -870,7 +871,8 @@ bool AdlEngine::matchCommand(const Command &command, byte verb, byte noun, uint
}
}
*actions = offset;
if (actions)
*actions = offset;
return true;
}

4
engines/adl/adl.h
View File

@ -198,9 +198,9 @@ private:
Common::Error run();
bool hasFeature(EngineFeature f) const;
Common::Error loadGameState(int slot);
bool canLoadGameStateCurrently() const;
bool canLoadGameStateCurrently();
Common::Error saveGameState(int slot, const Common::String &desc);
bool canSaveGameStateCurrently() const;
bool canSaveGameStateCurrently();
// Text output
void wordWrap(Common::String &str) const;