[Scummvm-git-logs] scummvm master -> 92b1cbbb7f4b118089e746e73a26563aad6417b0

[dreammaster]

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:
92b1cbbb7f XEEN: Fix game state after restarting game


Commit: 92b1cbbb7f4b118089e746e73a26563aad6417b0
    https://github.com/scummvm/scummvm/commit/92b1cbbb7f4b118089e746e73a26563aad6417b0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-02T21:36:36-04:00

Commit Message:
XEEN: Fix game state after restarting game

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


diff --git a/engines/xeen/files.cpp b/engines/xeen/files.cpp
index 5cf38f3..0fce5b3 100644
--- a/engines/xeen/files.cpp
+++ b/engines/xeen/files.cpp
@@ -504,6 +504,7 @@ void SaveArchive::load(Common::SeekableReadStream &stream) {
 void SaveArchive::reset(CCArchive *src) {
 	Common::MemoryWriteStreamDynamic saveFile(DisposeAfterUse::YES);
 	File fIn;
+	_newData.clear();
 
 	g_vm->_files->setGameCc(g_vm->getGameID() == GType_DarkSide ? 1 : 0);
 	const int RESOURCES[6] = { 0x2A0C, 0x2A1C, 0x2A2C, 0x2A3C, 0x284C, 0x2A5C };
diff --git a/engines/xeen/xeen.cpp b/engines/xeen/xeen.cpp
index 1d0e33d..854ac87 100644
--- a/engines/xeen/xeen.cpp
+++ b/engines/xeen/xeen.cpp
@@ -218,6 +218,7 @@ void XeenEngine::play() {
 		_party->_mazePosition.y = 21;
 	}
 
+	_map->clearMaze();
 	if (_loadSaveSlot >= 0) {
 		_saves->newGame();
 		_saves->loadGameState(_loadSaveSlot);