From 84741d73a09f45232b0dccd26df5b05eb6c80476 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 25 Jan 2015 20:05:35 -0500
Subject: XEEN: Properly clear previous MazeData when loading a new map

---
 engines/xeen/map.cpp | 13 ++++++++++++-
 engines/xeen/map.h   |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'engines/xeen')

diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 52dc4273aa..51e87ef97e 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -491,6 +491,10 @@ void MonsterData::synchronize(Common::SeekableReadStream &s) {
 /*------------------------------------------------------------------------*/
 
 SurroundingMazes::SurroundingMazes() {
+	clear();
+}
+
+void SurroundingMazes::clear() {
 	_north = 0;
 	_east = 0;
 	_south = 0;
@@ -541,6 +545,10 @@ void MazeDifficulties::synchronize(Common::SeekableReadStream &s) {
 /*------------------------------------------------------------------------*/
 
 MazeData::MazeData() {
+	clear();
+}
+
+void MazeData::clear() {
 	for (int y = 0; y < MAP_HEIGHT; ++y) {
 		for (int x = 0; x < MAP_WIDTH; ++x)
 			_wallData[y][x]._data = 0;
@@ -550,6 +558,7 @@ MazeData::MazeData() {
 		_surfaceTypes[y] = 0;
 	}
 	_mazeNumber = 0;
+	_surroundingMazes.clear();
 	_mazeFlags = _mazeFlags2  = 0;
 	_floorType = 0;
 	_trapDamage = 0;
@@ -963,7 +972,9 @@ void Map::load(int mapId) {
 	for (int idx = 0; idx < 9; ++idx, ++mazeDataP) {
 		mazeDataP->_mazeId = mapId;
 
-		if (mapId != 0) {
+		if (mapId == 0) {
+			mazeDataP->clear();
+		} else {
 			// Load in the maze's data file
 			Common::String datName = Common::String::format("maze%c%03d.dat",
 				(mapId >= 100) ? 'x' : '0', mapId);
diff --git a/engines/xeen/map.h b/engines/xeen/map.h
index f878a0d0d5..7d268efb8e 100644
--- a/engines/xeen/map.h
+++ b/engines/xeen/map.h
@@ -112,6 +112,8 @@ public:
 public:
 	SurroundingMazes();
 
+	void clear();
+
 	void synchronize(Common::SeekableReadStream &s);
 
 	int &operator[](int idx);
@@ -199,6 +201,8 @@ public:
 public:
 	MazeData();
 
+	void clear();
+
 	void synchronize(Common::SeekableReadStream &s);
 
 	void setAllTilesStepped();
-- 
cgit v1.2.3