diff options
| author | Travis Howell | 2006-04-01 06:38:47 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-01 06:38:47 +0000 |
| commit | 7a81cc76e16402e5f5dddcaed52af795a64197fa (patch) | |
| tree | 7884fa63c8dc8c605239745a15ab7ad2a5ae147c | |
| parent | 8a5df05aa02c2cb08b2d59bf904bc05087fe5c31 (diff) | |
| download | scummvm-rg350-7a81cc76e16402e5f5dddcaed52af795a64197fa.tar.gz scummvm-rg350-7a81cc76e16402e5f5dddcaed52af795a64197fa.tar.bz2 scummvm-rg350-7a81cc76e16402e5f5dddcaed52af795a64197fa.zip | |
Fix painting and fridge magnet palette glitches in thinker1
svn-id: r21522
| -rw-r--r-- | engines/scumm/he/script_v90he.cpp | 9 | ||||
| -rw-r--r-- | engines/scumm/he/wiz_he.cpp | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/engines/scumm/he/script_v90he.cpp b/engines/scumm/he/script_v90he.cpp index f40b9d0b08..cdfe909ee0 100644 --- a/engines/scumm/he/script_v90he.cpp +++ b/engines/scumm/he/script_v90he.cpp @@ -689,12 +689,11 @@ void ScummEngine_v90he::o90_wizImageOps() { _wizParams.processMode = 6; if (_wizParams.remapNum == 0) { memset(_wizParams.remapIndex, 0, sizeof(_wizParams.remapIndex)); - } else { - assert(_wizParams.remapNum < ARRAYSIZE(_wizParams.remapIndex)); - _wizParams.remapIndex[_wizParams.remapNum] = a; - _wizParams.remapColor[a] = b; - ++_wizParams.remapNum; } + assert(_wizParams.remapNum < ARRAYSIZE(_wizParams.remapIndex)); + _wizParams.remapIndex[_wizParams.remapNum] = a; + _wizParams.remapColor[a] = b; + _wizParams.remapNum++; break; case 21: _wizParams.processFlags |= kWPFClipBox; diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 6449a69830..ba5c66e453 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -1957,9 +1957,7 @@ void Wiz::processWizImage(const WizParameters *params) { } break; case 6: - if (params->processFlags & kWPFRemapPalette) { - remapWizImagePal(params); - } + remapWizImagePal(params); break; // HE 99+ case 7: |