[Scummvm-git-logs] scummvm master -> ea29c2356f0ee20fb06baa2c19df3663007e3f55

[dreammaster]

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:
c2b5d625fa XEEN: Fix check to allow Lloyding into Xeen's castle
ea29c2356f XEEN: Allow saving game after Clouds ending finishes


Commit: c2b5d625fa628e0d85d311850b8b8626a2c075db
    https://github.com/scummvm/scummvm/commit/c2b5d625fa628e0d85d311850b8b8626a2c075db
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-07T17:13:54-04:00

Commit Message:
XEEN: Fix check to allow Lloyding into Xeen's castle

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


diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp
index 6e76f7b..bce34cb 100644
--- a/engines/xeen/dialogs/dialogs_spells.cpp
+++ b/engines/xeen/dialogs/dialogs_spells.cpp
@@ -765,7 +765,8 @@ bool LloydsBeacon::execute() {
 
 		switch (_buttonValue) {
 		case Common::KEYCODE_r:
-			if (!ccNum && c._lloydMap >= XEEN_CASTLE1 && c._lloydMap <= XEEN_CASTLE4 && !party._cloudsCompleted) {
+			if (!ccNum && c._lloydMap >= XEEN_CASTLE1 && c._lloydMap <= XEEN_CASTLE4 && party._cloudsCompleted) {
+				// Xeen's Castle has already been destroyed
 				result = false;
 			} else {
 				sound.playFX(51);


Commit: ea29c2356f0ee20fb06baa2c19df3663007e3f55
    https://github.com/scummvm/scummvm/commit/ea29c2356f0ee20fb06baa2c19df3663007e3f55
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-07T17:23:13-04:00

Commit Message:
XEEN: Allow saving game after Clouds ending finishes

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 3cc8b44..34f059c 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1455,6 +1455,12 @@ bool Scripts::cmdPlayCD(ParamsIterator &params) { error("TODO"); }
 void Scripts::doCloudsEnding() {
 	g_vm->_party->_cloudsCompleted = true;
 	doEnding("ENDGAME");
+
+	g_vm->_mode = MODE_1;
+	g_vm->_saves->saveGame();
+
+	g_vm->_gameMode = GMODE_MENU;
+	g_vm->_mode = MODE_STARTUP;
 }
 
 void Scripts::doDarkSideEnding() {