diff options
| author | Travis Howell | 2003-09-01 06:11:41 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-09-01 06:11:41 +0000 |
| commit | e9727c157e1ffd455adddad7c351e25da03a2094 (patch) | |
| tree | f46b3f6d0337d1d80c7285d170af639ed3b5153d /scumm | |
| parent | db6cd6819696d2c39243d174e5540d9dd0a1edb1 (diff) | |
| download | scummvm-rg350-e9727c157e1ffd455adddad7c351e25da03a2094.tar.gz scummvm-rg350-e9727c157e1ffd455adddad7c351e25da03a2094.tar.bz2 scummvm-rg350-e9727c157e1ffd455adddad7c351e25da03a2094.zip | |
Minor cleanup of color cycle resource loading
svn-id: r9949
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index af6dfc3157..b78204cb2b 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -2242,15 +2242,15 @@ void Scumm::initRoomSubBlocks() { } // Color cycling - ptr = 0; - if (_features & GF_SMALL_HEADER) { - if (_gameId == GID_MONKEY_VGA) + if (_version >= 4) { + if (_features & GF_SMALL_HEADER) ptr = findResourceSmall (MKID('CYCL'), roomptr); - } else if (!(_features & GF_OLD_BUNDLE)) { - ptr = findResourceData(MKID('CYCL'), roomptr); + else + ptr = findResourceData(MKID('CYCL'), roomptr); + if (ptr) { + initCycl(ptr); + } } - if (ptr) - initCycl(ptr); // Transparent color if (_features & GF_OLD_BUNDLE) |