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

[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:
1b96899afc XEEN: Swords of Xeen doesn't have any dreams
c577f6dba4 XEEN: Don't save prior map state when loading new saves


Commit: 1b96899afcd78da0bf026f407df08de764f726eb
    https://github.com/scummvm/scummvm/commit/1b96899afcd78da0bf026f407df08de764f726eb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-24T15:50:23-05:00

Commit Message:
XEEN: Swords of Xeen doesn't have any dreams

Changed paths:
    engines/xeen/swordsofxeen/swordsofxeen.cpp


diff --git a/engines/xeen/swordsofxeen/swordsofxeen.cpp b/engines/xeen/swordsofxeen/swordsofxeen.cpp
index afd8467..ebe6f74 100644
--- a/engines/xeen/swordsofxeen/swordsofxeen.cpp
+++ b/engines/xeen/swordsofxeen/swordsofxeen.cpp
@@ -84,7 +84,7 @@ void SwordsOfXeenEngine::death() {
 }
 
 void SwordsOfXeenEngine::dream() {
-	error("TODO: Swords of Xeen dream sequence, if any");
+	// Swords of Xeen doesn't have any dreams
 }
 
 void SwordsOfXeenEngine::showCutscene(const Common::String &name, int status, uint score) {


Commit: c577f6dba40df60f48a87a1b6733abda5aa91dbb
    https://github.com/scummvm/scummvm/commit/c577f6dba40df60f48a87a1b6733abda5aa91dbb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-24T16:14:59-05:00

Commit Message:
XEEN: Don't save prior map state when loading new saves

Changed paths:
    engines/xeen/map.cpp
    engines/xeen/map.h
    engines/xeen/saves.cpp


diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 2200d14..d57d258 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -1169,6 +1169,10 @@ void Map::saveMaze() {
 	saveMonsters();
 }
 
+void Map::clearMaze() {
+	_mazeData[0]._mazeNumber = 0;
+}
+
 void Map::cellFlagLookup(const Common::Point &pt) {
 	Common::Point pos = pt;
 	findMap();
diff --git a/engines/xeen/map.h b/engines/xeen/map.h
index 1f17954..a0bc77a 100644
--- a/engines/xeen/map.h
+++ b/engines/xeen/map.h
@@ -484,6 +484,12 @@ public:
 	void saveMaze();
 
 	/**
+	 * Clears the current maze. This is used during savegame loads so that
+	 * the previous games maze data isn't saved as the new map is loaded
+	 */
+	void clearMaze();
+
+	/**
 	 * Gets the data for a map position at one of the relative indexes
 	 * surrounding the current position
 	 */
diff --git a/engines/xeen/saves.cpp b/engines/xeen/saves.cpp
index dbd3d8b..27819fd 100644
--- a/engines/xeen/saves.cpp
+++ b/engines/xeen/saves.cpp
@@ -213,6 +213,7 @@ Common::Error SavesManager::loadGameState(int slot) {
 	files.load(*saveFile);
 
 	// Load the new map
+	map.clearMaze();
 	map._loadDarkSide = files._isDarkCc;
 	map.load(party._mazeId);