diff options
| author | Travis Howell | 2006-02-05 06:32:16 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-02-05 06:32:16 +0000 |
| commit | f18672b3482654c5a4dee9a85c1c624e782d6d1c (patch) | |
| tree | 78a90307aa998da89247ab6d36fa46f108493144 | |
| parent | 37993562af3f7b5ec9fff276f16c1ee7890f4462 (diff) | |
| download | scummvm-rg350-f18672b3482654c5a4dee9a85c1c624e782d6d1c.tar.gz scummvm-rg350-f18672b3482654c5a4dee9a85c1c624e782d6d1c.tar.bz2 scummvm-rg350-f18672b3482654c5a4dee9a85c1c624e782d6d1c.zip | |
Another regression, palette cycling is used by HE61 too.
svn-id: r20387
| -rw-r--r-- | scumm/akos.cpp | 6 | ||||
| -rw-r--r-- | scumm/room.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp index 3b2b654a70..b886d8307d 100644 --- a/scumm/akos.cpp +++ b/scumm/akos.cpp @@ -366,6 +366,9 @@ byte AkosRenderer::drawLimb(const Actor *a, int limb) { bool useCondMask; int lastDx, lastDy; + if (_vm->_heversion >= 90) + _shadow_mode = 0; + lastDx = lastDy = 0; for (i = 0; i < 32; ++i) { heCondMaskIndex[i] = i; @@ -464,9 +467,6 @@ byte AkosRenderer::drawLimb(const Actor *a, int limb) { _ymove -= lastDy; } - if (_vm->_heversion >= 90) - _shadow_mode = 0; - if (!useCondMask || !akct) { decflag = 1; } else { diff --git a/scumm/room.cpp b/scumm/room.cpp index b7926346ca..6ae4fdd7ee 100644 --- a/scumm/room.cpp +++ b/scumm/room.cpp @@ -515,7 +515,7 @@ void ScummEngine::initRoomSubBlocks() { // Color cycling // HE 7.0 games load resources but don't use them. - if (_version >= 4 && _heversion <= 60) { + if (_version >= 4 && _heversion <= 61) { ptr = findResourceData(MKID('CYCL'), roomptr); if (ptr) { initCycl(ptr); |