thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Add some comments to our Indy4 Amiga verb palette handling.

Browse source 
We handle the verb palette map a bit different, since we use one 64 color
palette instead of two 32 color palettes for different screen areas.
This commit is contained in:
Johannes Schickel 2011-08-26 18:35:13 +02:00
parent e791f904ed
commit b4a17c702d
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/scumm/palette.cpp
View file

@ -400,6 +400,10 @@ void ScummEngine::setAmigaPaletteFromPtr(const byte *ptr) {
mapVerbPalette(i);
} else {
int idx = (i - 16) & 31;
// We adjust our verb palette map from [0, 31] to [32, 63], since unlike
// the original we set up the verb palette at colors [32, 63].
// The original instead used two different palettes for the verb virtual
// screen and all the rest.
if (idx != 17) {
_roomPalette[i] = idx;
_verbPalette[i] = idx + 32;
@ -454,6 +458,10 @@ int ScummEngine::remapRoomPaletteColor(int r, int g, int b) {
}
void ScummEngine::mapVerbPalette(int idx) {
// We adjust our verb palette map from [0, 31] to [32, 63], since unlike
// the original we set up the verb palette at colors [32, 63].
// The original instead used two different palettes for the verb virtual
// screen and all the rest.
if (idx >= 48 && idx < 80 && idx != 65)
_verbPalette[idx] = idx - 16;
else
@ -1220,6 +1228,8 @@ void ScummEngine::setPalColor(int idx, int r, int g, int b) {
if (i >= 16 && i < _amigaFirstUsedColor)
continue;
// We do - 16 instead of - 48 like the original, since our
// verb palette map is using [32, 63] instead of [0, 31].
if (idx - 16 == _verbPalette[i])
mapVerbPalette(i);
}