[Scummvm-git-logs] scummvm master -> 701df47cae2885c5c68bd03c41d0dda70072668d

[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:
5d6dbf7858 XEEN: Fix loading Dark Side savegames from WOX menu
701df47cae XEEN: Fix removing too many Monga Melons during quest


Commit: 5d6dbf78581b703060f4225f69990f5cec0b055f
    https://github.com/scummvm/scummvm/commit/5d6dbf78581b703060f4225f69990f5cec0b055f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-10T20:26:52-04:00

Commit Message:
XEEN: Fix loading Dark Side savegames from WOX menu

Changed paths:
    engines/xeen/xeen.cpp


diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index 41de1d8..d524028 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -219,8 +219,6 @@ void XeenEngine::play() {
 		_party->_mazeDirection = DIR_NORTH;
 		_party->_mazePosition.x = 25;
 		_party->_mazePosition.y = 21;
-	} else {
-		_map->_loadCcNum = g_vm->_files->_ccNum;
 	}
 
 	_map->clearMaze();


Commit: 701df47cae2885c5c68bd03c41d0dda70072668d
    https://github.com/scummvm/scummvm/commit/701df47cae2885c5c68bd03c41d0dda70072668d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-10T20:57:37-04:00

Commit Message:
XEEN: Fix removing too many Monga Melons during quest

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 298dead..0e6d721 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -738,7 +738,12 @@ bool Scripts::cmdTakeOrGive(ParamsIterator &params) {
 								// Break out of character loop
 								idx = party._activeParty.size();
 								break;
+							default:
+								break;
 							}
+						} else {
+							// Break out of character loop
+							idx = party._activeParty.size();
 						}
 						break;