diff options
| author | Paul Gilbert | 2015-01-24 09:35:56 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2015-01-24 09:35:56 -0500 |
| commit | 2b5167cafcebe78e797318690080e2ed3706da28 (patch) | |
| tree | 961f4793964376eaa71f5dadae88aa9b79dbde4d /engines/xeen/map.cpp | |
| parent | 1f8a5ea24a8c031979289953fdb674029338d9bc (diff) | |
| download | scummvm-rg350-2b5167cafcebe78e797318690080e2ed3706da28.tar.gz scummvm-rg350-2b5167cafcebe78e797318690080e2ed3706da28.tar.bz2 scummvm-rg350-2b5167cafcebe78e797318690080e2ed3706da28.zip | |
XEEN: Fix side loading bug in Map::load
Diffstat (limited to 'engines/xeen/map.cpp')
| -rw-r--r-- | engines/xeen/map.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp index 750e6347fb..4adf356a0c 100644 --- a/engines/xeen/map.cpp +++ b/engines/xeen/map.cpp @@ -857,8 +857,8 @@ void AnimationInfo::load(const Common::String &name) { /*------------------------------------------------------------------------*/ Map::Map(XeenEngine *vm) : _vm(vm), _mobData(vm) { - _townPortalSide = false; _loadDarkSide = false; + _sideTownPortal = 0; _sideObjects = 0; _sideMonsters = 0; _sidePictures = 0; @@ -897,13 +897,13 @@ void Map::load(int mapId) { _sideMonsters = 1; _sidePictures = 1; if (mapId >= 113 && mapId <= 127) { - _townPortalSide = false; + _sideTownPortal = 0; } else { - _townPortalSide = _loadDarkSide; + _sideTownPortal = _loadDarkSide ? 1 : 0; } if (_vm->getGameID() == GType_WorldOfXeen) { - if (_loadDarkSide) { + if (!_loadDarkSide) { _animationInfo.load("clouds.dat"); _monsterData.load("xeen.mon"); _wallPicSprites.load("xeenpic.dat"); @@ -1050,7 +1050,7 @@ void Map::load(int mapId) { filename = "085.obj"; _mobData._objectSprites[0]._spriteId = 85; } else { - filename = Common::String::format("xeen|%03d.%cbj", + filename = Common::String::format("%03d.%cbj", _mobData._objectSprites[i]._spriteId, _mobData._objectSprites[i]._spriteId >= 100 ? '0' : 'o'); } |