diff options
author | Torbjörn Andersson | 2007-08-04 06:18:28 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2007-08-04 06:18:28 +0000 |
commit | 3447c0e264c5850b9a2fb3cf4500a984501aa59a (patch) | |
tree | 4c0eea2ab995bb4d4a0583e9ccd947a616ea2241 | |
parent | feb07bb1d8f2db08dc0d06a3948bb1010132c2ce (diff) | |
download | scummvm-rg350-3447c0e264c5850b9a2fb3cf4500a984501aa59a.tar.gz scummvm-rg350-3447c0e264c5850b9a2fb3cf4500a984501aa59a.tar.bz2 scummvm-rg350-3447c0e264c5850b9a2fb3cf4500a984501aa59a.zip |
Tell the user if saving a game fails. (I haven't tested the saveGameSimple()
function, since I don't know when it's used.) This should fix bug #1767237
("AGI: Saving games to non existing path").
svn-id: r28441
-rw-r--r-- | engines/agi/agi.h | 1 | ||||
-rw-r--r-- | engines/agi/saveload.cpp | 24 |
2 files changed, 16 insertions, 9 deletions
diff --git a/engines/agi/agi.h b/engines/agi/agi.h index 942c4df72e..f37b61478e 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -156,6 +156,7 @@ enum AGIErrors { errNoLoopsInView, errViewDataError, errNoGameList, + errIOError, errUnk = 127 }; diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index 70096bddc2..05ce80b1a3 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -55,6 +55,7 @@ int AgiEngine::saveGame(const char *fileName, const char *description) { int i; struct ImageStackElement *ptr = _imageStack; Common::OutSaveFile *out; + int result = errOK; debugC(3, kDebugLevelMain | kDebugLevelSavegame, "AgiEngine::saveGame(%s, %s)", fileName, description); if (!(out = _saveFileMan->openForSaving(fileName))) { @@ -206,14 +207,15 @@ int AgiEngine::saveGame(const char *fileName, const char *description) { out->writeSint16BE(_gfx->getAGIPalFileNum()); out->finalize(); - if (out->ioFailed()) + if (out->ioFailed()) { warning("Can't write file '%s'. (Disk full?)", fileName); - else + result = errIOError; + } else debugC(1, kDebugLevelMain | kDebugLevelSavegame, "Saved game %s in file %s", description, fileName); delete out; debugC(3, kDebugLevelMain | kDebugLevelSavegame, "Closed %s", fileName); - return errOK; + return result; } int AgiEngine::loadGame(const char *fileName, bool checkId) { @@ -751,20 +753,24 @@ int AgiEngine::saveGameDialog() { sprintf(fileName, "%s", getSavegameFilename(slot)); debugC(8, kDebugLevelMain | kDebugLevelResources, "file is [%s]", fileName); - saveGame(fileName, desc); + int result = saveGame(fileName, desc); - messageBox("Game saved."); + if (result == errOK) + messageBox("Game saved."); + else + messageBox("Error saving game."); - return errOK; + return result; } int AgiEngine::saveGameSimple() { char fileName[MAX_PATH]; sprintf(fileName, "%s", getSavegameFilename(0)); - saveGame(fileName, "Default savegame"); - - return errOK; + int result = saveGame(fileName, "Default savegame"); + if (result != errOK) + messageBox("Error saving game."); + return result; } int AgiEngine::loadGameDialog() { |