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

[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:
d53051760d XEEN: Fix entering the Southern Sphinx


Commit: d53051760da47fa02477e58184d54b87567d9d34
    https://github.com/scummvm/scummvm/commit/d53051760da47fa02477e58184d54b87567d9d34
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-26T07:01:07-04:00

Commit Message:
XEEN: Fix entering the Southern Sphinx

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


diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 9631fa6..9d384c7 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -608,7 +608,6 @@ Map::Map(XeenEngine *vm) : _vm(vm), _mobData(vm) {
 	_sideObjects = 0;
 	_sideMonsters = 0;
 	_sidePictures = 0;
-	_sideMusic = 0;
 	_isOutdoors = false;
 	_mazeDataIndex = 0;
 	_currentSteppedOn = false;
@@ -879,8 +878,7 @@ void Map::load(int mapId) {
 		const int MUS_INDEXES[] = { 1, 2, 3, 4, 3, 5 };
 		Common::String musName;
 
-		_sideMusic = ccNum;
-		if (ccNum) {
+		if (files._ccNum) {
 			int randIndex = _vm->getRandomNumber(6);
 			musName = Res.MUSIC_FILES2[MUS_INDEXES[_mazeData->_wallKind]][randIndex];
 		} else {
diff --git a/engines/xeen/map.h b/engines/xeen/map.h
index 4d73aec..1bb3cf2 100644
--- a/engines/xeen/map.h
+++ b/engines/xeen/map.h
@@ -407,7 +407,6 @@ private:
 	int _sidePictures;
 	int _sideObjects;
 	int _sideMonsters;
-	int _sideMusic;
 	int _mazeDataIndex;
 
 	/**