1 files changed, 8 insertions, 17 deletions

diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index 0b308bb37b..db7bba13e4 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -91,7 +91,7 @@ int AgiEngine::saveGame(const char *fileName, const char *description) {
 	out->writeSint16BE((int16)_game.lognum);
 
 	out->writeSint16BE((int16)_game.playerControl);
-	out->writeSint16BE((int16)quit());
+	out->writeSint16BE((int16)_game.quitProgNow);
 	out->writeSint16BE((int16)_game.statusLine);
 	out->writeSint16BE((int16)_game.clockEnabled);
 	out->writeSint16BE((int16)_game.exitAllLogics);
@@ -214,9 +214,6 @@ int AgiEngine::saveGame(const char *fileName, const char *description) {
 
 	delete out;
 	debugC(3, kDebugLevelMain | kDebugLevelSavegame, "Closed %s", fileName);
-
-	_lastSaveTime = _system->getMillis();
-
 	return result;
 }
 
@@ -284,8 +281,7 @@ int AgiEngine::loadGame(const char *fileName, bool checkId) {
 	_game.lognum = in->readSint16BE();
 
 	_game.playerControl = in->readSint16BE();
-	if (in->readSint16BE())
-		quitGame();
+	_game.quitProgNow = in->readSint16BE();
 	_game.statusLine = in->readSint16BE();
 	_game.clockEnabled = in->readSint16BE();
 	_game.exitAllLogics = in->readSint16BE();
@@ -702,18 +698,13 @@ int AgiEngine::saveGameDialog() {
 
 	sprintf(fileName, "%s", getSavegameFilename(slot));
 
+	drawWindow(hp, vp, GFX_WIDTH - hp, GFX_HEIGHT - vp);
+	printText("Select a slot in which you wish to\nsave the game:",
+			0, hm + 1, vm + 1, w, MSG_BOX_TEXT, MSG_BOX_COLOUR);
 
-	do {
-		drawWindow(hp, vp, GFX_WIDTH - hp, GFX_HEIGHT - vp);
-		printText("Select a slot in which you wish to\nsave the game:",
-				0, hm + 1, vm + 1, w, MSG_BOX_TEXT, MSG_BOX_COLOUR);
-		slot = selectSlot();
-		if (slot == 0)
-			messageBox("That slot is for Autosave only.");
-		else if (slot < 0)
-			return errOK;
-	}
-	while (slot == 0);
+	slot = selectSlot();
+	if (slot < 0)
+		return errOK;
 
 	drawWindow(hp, vp + 5 * CHAR_LINES, GFX_WIDTH - hp,
 			GFX_HEIGHT - vp - 9 * CHAR_LINES);