aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-05-20 22:34:26 -0400
committerPaul Gilbert2014-05-20 22:34:26 -0400
commit17012de54b900400548d598fe051343924838565 (patch)
tree3d284debe78fc73ab0d676afec14d19ed40384ed
parent876ef49a3a7596ff2d26195923d43b1a886ca065 (diff)
downloadscummvm-rg350-17012de54b900400548d598fe051343924838565.tar.gz
scummvm-rg350-17012de54b900400548d598fe051343924838565.tar.bz2
scummvm-rg350-17012de54b900400548d598fe051343924838565.zip
MADS: Remove redundant frame entry remap block in animation loading
-rw-r--r--engines/mads/animation.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index f55e485c20..25fa4a8e06 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -296,18 +296,10 @@ void Animation::load(UserInterface &interfaceSurface, MSurface &depthSurface,
if (usageList.size() > 0)
_vm->_palette->_paletteUsage.updateUsage(usageList, _header._messagesCount);
- if (_header._bgType == ANIMBG_INTERFACE) {
- // Remaps the sprite list indexes for frames to the loaded sprite list indexes
- for (uint i = 0; i < _frameEntries.size(); ++i) {
- int spriteListIndex = _frameEntries[i]._spriteSlot._spritesIndex;
- _frameEntries[i]._spriteSlot._spritesIndex = _spriteListIndexes[spriteListIndex];
- }
- } else {
- // Remaps the sprite list indexes for frames to the loaded sprite list indexes
- for (uint i = 0; i < _frameEntries.size(); ++i) {
- int spriteListIndex = _frameEntries[i]._spriteSlot._spritesIndex;
- _frameEntries[i]._spriteSlot._spritesIndex = _spriteListIndexes[spriteListIndex];
- }
+ // Remaps the sprite list indexes for frames to the loaded sprite list indexes
+ for (uint i = 0; i < _frameEntries.size(); ++i) {
+ int spriteListIndex = _frameEntries[i]._spriteSlot._spritesIndex;
+ _frameEntries[i]._spriteSlot._spritesIndex = _spriteListIndexes[spriteListIndex];
}
f.close();