aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-04-11 09:34:46 -0400
committerPaul Gilbert2014-04-11 09:34:46 -0400
commitf548711b7740fcaa01027a9184e4ae90a1c792e9 (patch)
tree2a7cf37400937f49713cb83fbbc0c04d860c8d87
parent9ef9dd24c273950328a4f5ea99b36c91b4a4de81 (diff)
downloadscummvm-rg350-f548711b7740fcaa01027a9184e4ae90a1c792e9.tar.gz
scummvm-rg350-f548711b7740fcaa01027a9184e4ae90a1c792e9.tar.bz2
scummvm-rg350-f548711b7740fcaa01027a9184e4ae90a1c792e9.zip
MADS: Fix palette transformation during SceneInfo::load
-rw-r--r--engines/mads/palette.cpp2
-rw-r--r--engines/mads/scene_data.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 34ba0acf54..2ff16fb5c1 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -250,7 +250,7 @@ void PaletteUsage::transform(Common::Array<RGB6> &palette) {
if (!empty()) {
for (uint i = 0; i < _data.size(); ++i) {
int palIndex = _data[i]._palIndex;
- _data[i] = palette[palIndex]._palIndex;
+ _data[i]._palIndex = palette[palIndex]._palIndex;
}
}
}
diff --git a/engines/mads/scene_data.cpp b/engines/mads/scene_data.cpp
index f92ff86798..a82f65a6f0 100644
--- a/engines/mads/scene_data.cpp
+++ b/engines/mads/scene_data.cpp
@@ -219,7 +219,7 @@ void SceneInfo::load(int sceneId, int variant, const Common::String &resName,
for (uint i = 0; i < _palAnimData.size(); ++i) {
byte g = _palAnimData[i].g;
- _palAnimData[g].b = artHeader._palAnimData[g].u;
+ _palAnimData[i].b = artHeader._palette[g]._palIndex;
}
}
}