aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Page2008-08-15 21:25:24 +0000
committerChristopher Page2008-08-15 21:25:24 +0000
commitdca5f7dc20743d57c30ee2978979c3f5b313658f (patch)
tree064bf088d90bb267c855de1b4827a66927bf758c
parent603f0a2f8c9a57f48c6a1d4b3ae7f12ed7e4d25f (diff)
downloadscummvm-rg350-dca5f7dc20743d57c30ee2978979c3f5b313658f.tar.gz
scummvm-rg350-dca5f7dc20743d57c30ee2978979c3f5b313658f.tar.bz2
scummvm-rg350-dca5f7dc20743d57c30ee2978979c3f5b313658f.zip
If the last savegame is deleted, reset save_slot in config man to -1
svn-id: r33918
-rw-r--r--engines/sword1/sword1.cpp2
-rw-r--r--gui/launcher.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 1a7ae87f66..c20f1c1422 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -696,7 +696,7 @@ int SwordEngine::go() {
int saveSlot = ConfMan.getInt("save_slot");
// Savegames are numbered starting from 1 in the dialog window,
// but their filenames are numbered starting from 0.
- if (saveSlot >= 0 && _control->savegamesExist() &&_control->restoreGameFromFile(saveSlot)) {
+ if (saveSlot >= 0 && _control->savegamesExist() && _control->restoreGameFromFile(saveSlot)) {
_control->doRestore();
} else if (_control->savegamesExist()) {
_systemVars.controlPanelMode = CP_NEWGAME;
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 17fdbaddbb..df73df9526 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -969,6 +969,8 @@ void LauncherDialog::loadGame(int item) {
String filename = saveList[idx].filename();
printf("Deleting file: %s\n", filename.c_str());
saveFileMan->removeSavefile(filename.c_str());
+ if ((saveList.size() - 1) == 0)
+ ConfMan.setInt("save_slot", -1);
}
// Load the savegame
else {