[Scummvm-cvs-logs] scummvm master -> 7ba345be57c4e8f98d4cad2dcc64a088d60ed9ff

eriktorbjorn eriktorbjorn at telia.com
Sun May 15 22:55:01 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7ba345be57 TSAGE: Fix some errors in endGame().


Commit: 7ba345be57c4e8f98d4cad2dcc64a088d60ed9ff
    https://github.com/scummvm/scummvm/commit/7ba345be57c4e8f98d4cad2dcc64a088d60ed9ff
Author: eriktorbjorn (eriktorbjorn at users.sourceforge.net)
Date: 2011-05-15T13:49:19-07:00

Commit Message:
TSAGE: Fix some errors in endGame().

Save slot 0 is valid. It's -1 that indicates cancelling. Also, we
need to check if the user tried to quit, to avoid a nasty loop of
hard-to-terminate restore dialogs.

Changed paths:
    engines/tsage/ringworld_logic.cpp



diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp
index 82331ba..a03c408 100644
--- a/engines/tsage/ringworld_logic.cpp
+++ b/engines/tsage/ringworld_logic.cpp
@@ -1409,11 +1409,11 @@ void RingworldGame::endGame(int resNum, int lineNum) {
 		// Savegames exist, so prompt for Restore/Restart
 		bool breakFlag;
 		do {
-			if (MessageDialog::show(msg, RESTART_BTN_STRING, RESTORE_BTN_STRING) == 0) {
+			if (MessageDialog::show(msg, RESTART_BTN_STRING, RESTORE_BTN_STRING) == 0 || _vm->shouldQuit()) {
 				breakFlag = true;
 			} else {
 				handleSaveLoad(false, _globals->_sceneHandler._loadGameSlot, _globals->_sceneHandler._saveName);
-				breakFlag = _globals->_sceneHandler._loadGameSlot > 0;
+				breakFlag = _globals->_sceneHandler._loadGameSlot >= 0;
 			}
 		} while (!breakFlag);
 	}






More information about the Scummvm-git-logs mailing list