[Scummvm-git-logs] scummvm master -> 7e9d25006202952bea6b54d3fd6f4d19180ad6e0

dreammaster dreammaster at scummvm.org
Wed Mar 14 00:14:57 CET 2018


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

Summary:
0ea2321e76 XEEN: Fix saving to slot 0 using in-game Control Panel
7e9d250062 XEEN: Fix closing Awards dialog


Commit: 0ea2321e76003b68ef49a41169c5d04c2a73aea3
    https://github.com/scummvm/scummvm/commit/0ea2321e76003b68ef49a41169c5d04c2a73aea3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-13T19:04:08-04:00

Commit Message:
XEEN: Fix saving to slot 0 using in-game Control Panel

Changed paths:
    engines/xeen/saves.cpp


diff --git a/engines/xeen/saves.cpp b/engines/xeen/saves.cpp
index a338aaf..7bd9381 100644
--- a/engines/xeen/saves.cpp
+++ b/engines/xeen/saves.cpp
@@ -267,7 +267,7 @@ bool SavesManager::saveGame() {
 	Common::String saveName = dialog->getResultString();
 	delete dialog;
 
-	if (slotNum)
+	if (slotNum != -1)
 		saveGameState(slotNum, saveName);
 
 	return slotNum != -1;


Commit: 7e9d25006202952bea6b54d3fd6f4d19180ad6e0
    https://github.com/scummvm/scummvm/commit/7e9d25006202952bea6b54d3fd6f4d19180ad6e0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-13T19:14:51-04:00

Commit Message:
XEEN: Fix closing Awards dialog

Changed paths:
    engines/xeen/dialogs/dialogs_awards.cpp


diff --git a/engines/xeen/dialogs/dialogs_awards.cpp b/engines/xeen/dialogs/dialogs_awards.cpp
index 8e8bfcf..f0181d6 100644
--- a/engines/xeen/dialogs/dialogs_awards.cpp
+++ b/engines/xeen/dialogs/dialogs_awards.cpp
@@ -113,7 +113,7 @@ void Awards::execute(const Character *ch) {
 	}
 
 	// Close the window
-	if (win29Open) {
+	if (!win29Open) {
 		windows[30].close();
 		windows[29].close();
 	}





More information about the Scummvm-git-logs mailing list