diff options
| author | Paul Gilbert | 2018-02-24 18:32:07 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2018-02-24 18:32:07 -0500 |
| commit | 5d4bc20d6208d45c5a5d8e7629cce50e894c7b38 (patch) | |
| tree | 0c1f0b531147c1ec46a09c04fb97188732d8eeaa | |
| parent | 394fcc8c847a7b68d5c1f20fc24c1a0c0557a16f (diff) | |
| download | scummvm-rg350-5d4bc20d6208d45c5a5d8e7629cce50e894c7b38.tar.gz scummvm-rg350-5d4bc20d6208d45c5a5d8e7629cce50e894c7b38.tar.bz2 scummvm-rg350-5d4bc20d6208d45c5a5d8e7629cce50e894c7b38.zip | |
XEEN: Fix resetting wall sprites between maps
| -rw-r--r-- | engines/xeen/interface_scene.cpp | 10 | ||||
| -rw-r--r-- | engines/xeen/sprites.cpp | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/engines/xeen/interface_scene.cpp b/engines/xeen/interface_scene.cpp index 4225d874fd..b82cd7ae38 100644 --- a/engines/xeen/interface_scene.cpp +++ b/engines/xeen/interface_scene.cpp @@ -4427,31 +4427,31 @@ void InterfaceScene::drawOutdoors() { map.getCell(TERRAIN_INDEXES1[idx]); assert(map._currentWall != INVALID_CELL); SpriteResource &spr = map._wallSprites._surfaces[map._currentWall]; - _outdoorList[28 + idx]._sprites = spr.size() == 0 ? (SpriteResource *)nullptr : &spr; + _outdoorList[28 + idx]._sprites = spr.empty() ? (SpriteResource *)nullptr : &spr; } for (int idx = 0; idx < 5; ++idx) { map.getCell(TERRAIN_INDEXES2[idx]); assert(map._currentWall != INVALID_CELL); SpriteResource &spr = map._wallSprites._surfaces[map._currentWall]; - _outdoorList[61 + idx]._sprites = spr.size() == 0 ? (SpriteResource *)nullptr : &spr; + _outdoorList[61 + idx]._sprites = spr.empty() ? (SpriteResource *)nullptr : &spr; } for (int idx = 0; idx < 3; ++idx) { map.getCell(TERRAIN_INDEXES3[idx]); assert(map._currentWall != INVALID_CELL); SpriteResource &spr = map._wallSprites._surfaces[map._currentWall]; - _outdoorList[84 + idx]._sprites = spr.size() == 0 ? (SpriteResource *)nullptr : &spr; + _outdoorList[84 + idx]._sprites = spr.empty() ? (SpriteResource *)nullptr : &spr; } for (int idx = 0; idx < 5; ++idx) { map.getCell(TERRAIN_INDEXES4[idx]); assert(map._currentWall != INVALID_CELL); SpriteResource &spr = map._wallSprites._surfaces[map._currentWall]; - _outdoorList[103 + idx]._sprites = spr.size() == 0 ? (SpriteResource *)nullptr : &spr; + _outdoorList[103 + idx]._sprites = spr.empty() ? (SpriteResource *)nullptr : &spr; } map.getCell(1); assert(map._currentWall != INVALID_CELL); SpriteResource &surface = map._wallSprites._surfaces[map._currentWall]; - _outdoorList[108]._sprites = surface.size() == 0 ? (SpriteResource *)nullptr : &surface; + _outdoorList[108]._sprites = surface.empty() ? (SpriteResource *)nullptr : &surface; _outdoorList[109]._sprites = _outdoorList[108]._sprites; _outdoorList[110]._sprites = _outdoorList[108]._sprites; _outdoorList._sky1._flags = _outdoorList._sky2._flags = _flipSky ? SPRFLAG_HORIZ_FLIPPED : 0; diff --git a/engines/xeen/sprites.cpp b/engines/xeen/sprites.cpp index 3555658ea2..e55a69e821 100644 --- a/engines/xeen/sprites.cpp +++ b/engines/xeen/sprites.cpp @@ -104,6 +104,7 @@ void SpriteResource::clear() { delete[] _data; _data = nullptr; _filesize = 0; + _index.clear(); } void SpriteResource::drawOffset(XSurface &dest, uint16 offset, const Common::Point &pt, |