diff options
| author | David Corrales | 2007-05-26 20:23:24 +0000 |
|---|---|---|
| committer | David Corrales | 2007-05-26 20:23:24 +0000 |
| commit | 3646c968c9578c2a94d65ebd5fb06ec835f8c51d (patch) | |
| tree | 8b57b339ebb31a1d7a67f1678aa5dc5c7759070a /engines/agi/saveload.cpp | |
| parent | d1f56d93f934150f4b579c2e90564e2bf035f113 (diff) | |
| parent | ac45c5b33d834acbc9718f89be76e49d403a4d2c (diff) | |
| download | scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.tar.gz scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.tar.bz2 scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.zip | |
Merged the fs branch with trunk. r26472:26948
svn-id: r26949
Diffstat (limited to 'engines/agi/saveload.cpp')
| -rw-r--r-- | engines/agi/saveload.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index 4f25b58cc5..94701baa32 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -215,7 +215,7 @@ int AgiEngine::saveGame(const char *fileName, const char *description) { return errOK; } -int AgiEngine::loadGame(const char *fileName) { +int AgiEngine::loadGame(const char *fileName, bool checkId) { char description[31], saveVersion, loadId[8]; int i, vtEntries = MAX_VIEWTABLE; uint8 t; @@ -251,7 +251,7 @@ int AgiEngine::loadGame(const char *fileName) { _game.state = in->readByte(); in->read(loadId, 8); - if (strcmp(loadId, _game.id)) { + if (strcmp(loadId, _game.id) && checkId) { delete in; warning("This save seems to be from a different AGI game (save from %s, running %s), not loaded", loadId, _game.id); return errBadFileOpen; |