diff options
Diffstat (limited to 'engines/scumm/palette.cpp')
| -rw-r--r-- | engines/scumm/palette.cpp | 73 |
1 files changed, 70 insertions, 3 deletions
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp index 09da1b47c4..5c0c58595b 100644 --- a/engines/scumm/palette.cpp +++ b/engines/scumm/palette.cpp @@ -30,6 +30,7 @@ #include "scumm/scumm_v6.h" #include "scumm/scumm_v8.h" #include "scumm/util.h" +#include "scumm/charset.h" namespace Scumm { @@ -56,11 +57,17 @@ uint16 ScummEngine::get16BitColor(uint8 r, uint8 g, uint8 b) { void ScummEngine::resetPalette() { static const byte tableC64Palette[] = { +#if 1 // VICE-based palette. See bug #2847001 + 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x7E, 0x35, 0x2B, 0x6E, 0xB7, 0xC1, + 0x7F, 0x3B, 0xA6, 0x5C, 0xA0, 0x35, 0x33, 0x27, 0x99, 0xCB, 0xD7, 0x65, + 0x85, 0x53, 0x1C, 0x50, 0x3C, 0x00, 0xB4, 0x6B, 0x61, 0x4A, 0x4A, 0x4A, + 0x75, 0x75, 0x75, 0xA3, 0xE7, 0x7C, 0x70, 0x64, 0xD6, 0xA3, 0xA3, 0xA3, +#else 0x00, 0x00, 0x00, 0xFD, 0xFE, 0xFC, 0xBE, 0x1A, 0x24, 0x30, 0xE6, 0xC6, 0xB4, 0x1A, 0xE2, 0x1F, 0xD2, 0x1E, 0x21, 0x1B, 0xAE, 0xDF, 0xF6, 0x0A, 0xB8, 0x41, 0x04, 0x6A, 0x33, 0x04, 0xFE, 0x4A, 0x57, 0x42, 0x45, 0x40, 0x70, 0x74, 0x6F, 0x59, 0xFE, 0x59, 0x5F, 0x53, 0xFE, 0xA4, 0xA7, 0xA2, - +#endif // Use 17 color table for v1 games to allow correct color for inventory and // sentence line. Original games used some kind of dynamic color table // remapping between rooms. @@ -133,6 +140,24 @@ void ScummEngine::resetPalette() { 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00 }; +#ifdef USE_RGB_COLOR +#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE + static const byte tableTownsV3Palette[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0x00, 0xA0, 0xA0, + 0xA0, 0x00, 0x00, 0xA0, 0x00, 0xA0, 0xA0, 0x60, 0x00, 0xA0, 0xA0, 0xA0, + 0x60, 0x60, 0x60, 0x60, 0x60, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0xE0, 0xE0, + 0xE0, 0x80, 0x80, 0xE0, 0x00, 0xE0, 0xE0, 0xE0, 0x00, 0xE0, 0xE0, 0xE0 + }; + + static const byte tableTownsLoomPalette[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x00, 0xAB, 0x00, 0x00, 0xAB, 0xAB, + 0xAB, 0x00, 0x00, 0x69, 0x29, 0x45, 0x8C, 0x4D, 0x14, 0xAB, 0xAB, 0xAB, + 0x57, 0x3F, 0x57, 0x57, 0x57, 0xFF, 0x57, 0xFF, 0x57, 0x57, 0xFF, 0xFF, + 0xFF, 0x57, 0x57, 0xD6, 0x94, 0x40, 0xFF, 0xFF, 0x57, 0xFF, 0xFF, 0xFF + }; +#endif +#endif + if (_game.version <= 1) { if (_game.platform == Common::kPlatformApple2GS) { // TODO: unique palette? @@ -192,6 +217,19 @@ void ScummEngine::resetPalette() { // else we initialise and then lock down the first 16 colors. if (_renderMode != Common::kRenderEGA) setPaletteFromTable(tableAmigaMIPalette, sizeof(tableAmigaMIPalette) / 3); +#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE + } else if (_game.platform == Common::kPlatformFMTowns) { + if (_game.id == GID_INDY4 || _game.id == GID_MONKEY2) + _townsClearLayerFlag = 0; +#ifdef USE_RGB_COLOR + else if (_game.id == GID_LOOM) + towns_setTextPaletteFromPtr(tableTownsLoomPalette); + else if (_game.version == 3) + towns_setTextPaletteFromPtr(tableTownsV3Palette); +#endif + + _townsScreen->toggleLayers(_townsActiveLayerFlags); +#endif // DISABLE_TOWNS_DUAL_LAYER_MODE } setDirtyColors(0, 255); } @@ -459,6 +497,11 @@ void ScummEngine::cyclePalette() { int valueToAdd; int i, j; +#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE + if (_game.platform == Common::kPlatformFMTowns && (!_townsPaletteFlags & 1)) + return; +#endif + valueToAdd = VAR(VAR_TIMER); if (valueToAdd < VAR(VAR_TIMER_NEXT)) valueToAdd = VAR(VAR_TIMER_NEXT); @@ -500,6 +543,11 @@ void ScummEngine::moveMemInPalRes(int start, int end, byte direction) { } void ScummEngine::palManipulateInit(int resID, int start, int end, int time) { +#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE + if (_game.platform == Common::kPlatformFMTowns && (!_townsPaletteFlags & 1)) + return; +#endif + byte *string1 = getStringAddress(resID); byte *string2 = getStringAddress(resID + 1); byte *string3 = getStringAddress(resID + 2); @@ -967,6 +1015,12 @@ void ScummEngine::setCurrentPalette(int palindex) { pals = getPalettePtr(_curPalIndex, _roomResource); if (_game.id == GID_LOOM && _game.platform == Common::kPlatformPCEngine) { setPCEPaletteFromPtr(pals); +#ifdef USE_RGB_COLOR +#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE + } else if (_game.platform == Common::kPlatformFMTowns) { + towns_setPaletteFromPtr(pals); +#endif +#endif } else { setPaletteFromPtr(pals); } @@ -1063,10 +1117,23 @@ void ScummEngine::updatePalette() { } } - _system->setPalette(palette_colors, first, num); - _palDirtyMax = -1; _palDirtyMin = 256; + +#ifdef USE_RGB_COLOR +#ifndef DISABLE_TOWNS_DUAL_LAYER_MODE + if (_game.platform == Common::kPlatformFMTowns) { + p = palette_colors; + for (i = first; i < first + num; ++i) { + _16BitPalette[i] = get16BitColor(p[0], p[1], p[2]); + p += 4; + } + return; + } +#endif +#endif + + _system->setPalette(palette_colors, first, num); } } // End of namespace Scumm |