diff options
| author | Johannes Schickel | 2009-06-25 02:38:19 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-25 02:38:19 +0000 |
| commit | 951e82a9219c6f536f505adea92faae5e1eb669d (patch) | |
| tree | 25c20af3c3109425378906175c1b04d06fe02269 /engines/kyra/screen.cpp | |
| parent | 6e299e4777b9b3653dea75ece726ccb0f1f2d617 (diff) | |
| download | scummvm-rg350-951e82a9219c6f536f505adea92faae5e1eb669d.tar.gz scummvm-rg350-951e82a9219c6f536f505adea92faae5e1eb669d.tar.bz2 scummvm-rg350-951e82a9219c6f536f505adea92faae5e1eb669d.zip | |
Readd PC98 palette loading for LoL 16 color.
svn-id: r41850
Diffstat (limited to 'engines/kyra/screen.cpp')
| -rw-r--r-- | engines/kyra/screen.cpp | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 41ac81406c..b9929bab1a 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -2831,6 +2831,8 @@ bool Screen::loadPalette(const char *filename, Palette &pal) { if (_vm->gameFlags().platform == Common::kPlatformAmiga) pal.loadAmigaPalette(*stream, stream->size() / Palette::kAmigaBytesPerColor); + else if (_vm->gameFlags().platform == Common::kPlatformPC98 && _use16ColorMode) + pal.loadPC98Palette(*stream, stream->size() / Palette::kPC98BytesPerColor); else pal.loadVGAPalette(*stream, stream->size() / Palette::kVGABytesPerColor); @@ -2870,9 +2872,11 @@ void Screen::loadPalette(const byte *data, Palette &pal, int bytes) { Common::MemoryReadStream stream(data, bytes, false); if (_vm->gameFlags().platform == Common::kPlatformAmiga) - pal.loadAmigaPalette(stream, stream.size() / 2); + pal.loadAmigaPalette(stream, stream.size() / Palette::kAmigaBytesPerColor); + else if (_vm->gameFlags().platform == Common::kPlatformPC98 && _use16ColorMode) + pal.loadPC98Palette(stream, stream.size() / Palette::kPC98BytesPerColor); else - pal.loadVGAPalette(stream, stream.size() / 3); + pal.loadVGAPalette(stream, stream.size() / Palette::kVGABytesPerColor); } // dirty rect handling @@ -3280,6 +3284,23 @@ void Palette::loadAmigaPalette(Common::ReadStream &stream, int colors) { memset(_palData + colors * 3, 0, (_numColors - colors) * 3); } +void Palette::loadPC98Palette(Common::ReadStream &stream, int colors) { + if (colors == -1) + colors = _numColors; + + assert(colors <= _numColors); + + for (int i = 0; i < colors; ++i) { + const byte g = stream.readByte(), r = stream.readByte(), b = stream.readByte(); + + _palData[i * 3 + 0] = ((r & 0x0F) * 0x3F) / 0x0F; + _palData[i * 3 + 1] = ((g & 0x0F) * 0x3F) / 0x0F; + _palData[i * 3 + 2] = ((b & 0x0F) * 0x3F) / 0x0F; + } + + memset(_palData + colors * 3, 0, (_numColors - colors) * 3); +} + void Palette::clear() { memset(_palData, 0, _numColors * 3); } |