aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2018-04-26 07:01:07 -0400
committerPaul Gilbert2018-04-26 07:01:07 -0400
commitd53051760da47fa02477e58184d54b87567d9d34 (patch)
tree32a80f1efc08e4fdf79e50ca5d871f6253d667e8
parentef1b0171bf206c86c05cb75fafa9bc60f6c6a251 (diff)
downloadscummvm-rg350-d53051760da47fa02477e58184d54b87567d9d34.tar.gz
scummvm-rg350-d53051760da47fa02477e58184d54b87567d9d34.tar.bz2
scummvm-rg350-d53051760da47fa02477e58184d54b87567d9d34.zip
XEEN: Fix entering the Southern Sphinx
-rw-r--r--engines/xeen/map.cpp4
-rw-r--r--engines/xeen/map.h1
2 files changed, 1 insertions, 4 deletions
diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 9631fa62c1..9d384c7c8f 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 4d73aec818..1bb3cf288c 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;
/**