diff options
| author | Paul Gilbert | 2014-06-01 11:48:19 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-06-01 11:48:19 -0400 |
| commit | f16dd2a7f270fdbf116657dad13817f9b36a6a96 (patch) | |
| tree | 190a2cd3e978513995e6bf2af57d622592fc8f4a /engines | |
| parent | 7227d723a40080c0d65ec0a5cd0f37b6f480ec37 (diff) | |
| download | scummvm-rg350-f16dd2a7f270fdbf116657dad13817f9b36a6a96.tar.gz scummvm-rg350-f16dd2a7f270fdbf116657dad13817f9b36a6a96.tar.bz2 scummvm-rg350-f16dd2a7f270fdbf116657dad13817f9b36a6a96.zip | |
MADS: Minor fixes for sprite asset flags passing
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mads/assets.cpp | 4 | ||||
| -rw-r--r-- | engines/mads/palette.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/mads/assets.cpp b/engines/mads/assets.cpp index 82585d574a..a2d495f311 100644 --- a/engines/mads/assets.cpp +++ b/engines/mads/assets.cpp @@ -101,7 +101,7 @@ void SpriteAsset::load(Common::SeekableReadStream *stream, int flags) { if (flags & (ASSET_TRANSLATE | ASSET_SPINNING_OBJECT)) { _usageIndex = 0; - if (flags & 8) { + if (flags & ASSET_SPINNING_OBJECT) { int newPalCtr = 0; for (uint i = 0; i < palette.size(); ++i) { @@ -131,7 +131,7 @@ void SpriteAsset::load(Common::SeekableReadStream *stream, int flags) { } } } else { - _usageIndex = _vm->_palette->_paletteUsage.process(palette, flags); + _usageIndex = _vm->_palette->_paletteUsage.process(palette, flags & 0xF800); assert(_usageIndex >= 0); } diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp index 0028548c1e..f8670c71dc 100644 --- a/engines/mads/palette.cpp +++ b/engines/mads/palette.cpp @@ -285,7 +285,7 @@ void PaletteUsage::resetPalFlags(int idx) { *flagP = 0; } - _vm->_palette->_rgbList[idx] = 0; + _vm->_palette->_rgbList[idx] = false; } } |