diff options
| author | Max Horn | 2003-10-13 12:17:26 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-13 12:17:26 +0000 |
| commit | 1f16d325342e129d90d4e306df5538c8e4296b18 (patch) | |
| tree | 037df888df706ab003f25fc396986a4d4c873584 | |
| parent | 472e7d679051b6dfa64822ecaa70c040112b0dc3 (diff) | |
| download | scummvm-rg350-1f16d325342e129d90d4e306df5538c8e4296b18.tar.gz scummvm-rg350-1f16d325342e129d90d4e306df5538c8e4296b18.tar.bz2 scummvm-rg350-1f16d325342e129d90d4e306df5538c8e4296b18.zip | |
sufficient to set _roomPalette at the start for V6+ games, since they don't modify the _roomPalette, ever
svn-id: r10777
| -rw-r--r-- | scumm/scummvm.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index d6e6a1a5db..e3ec54f1f3 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -927,18 +927,16 @@ void ScummEngine::scummInit() { initScreens(0, 16, _screenWidth, 144); } + for (i = 0; i < 256; i++) + _roomPalette[i] = i; if (_version == 1) { - for (i = 0; i < 16; i++) - _roomPalette[i] = i; if (_gameId == GID_MANIAC) setupV1ManiacPalette(); else setupV1ZakPalette(); } else if (_features & GF_16COLOR) { - for (i = 0; i < 16; i++) { - _roomPalette[i] = i; + for (i = 0; i < 16; i++) _shadowPalette[i] = i; - } if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST)) setupAmigaPalette(); else @@ -1890,13 +1888,14 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { _actors[i].hideActor(); } - for (i = 0; i < 256; i++) { - _roomPalette[i] = i; - if (_version < 7) + if (_version < 7) { + for (i = 0; i < 256; i++) { + _roomPalette[i] = i; _shadowPalette[i] = i; + } + if (_features & GF_SMALL_HEADER) + setDirtyColors(0, 255); } - if (_features & GF_SMALL_HEADER) - setDirtyColors(0, 255); clearDrawObjectQueue(); |