diff options
| -rw-r--r-- | engines/kyra/screen_lol.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/screen_lol.h | 1 | ||||
| -rw-r--r-- | engines/kyra/staticres.cpp | 36 |
3 files changed, 2 insertions, 39 deletions
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index 46b243a4cf..ce8a1bdaa4 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -912,7 +912,7 @@ void Screen_LoL::mergeOverlay(int x, int y, int w, int h) { void Screen_LoL::convertPC98Gfx(uint8 *data, int w, int h, int pitch) { while (h--) { for (int i = 0; i < w; ++i) { - *data = _paletteConvTable[*data]; + *data = (*data >> 4) & (*data & 0x0F); ++data; } @@ -927,7 +927,7 @@ void Screen_LoL::postProcessCursor(uint8 *data, int w, int h, int pitch) { while (h--) { for (int i = 0; i < w; ++i) { if (*data != _cursorColorKey) - *data = _paletteConvTable[*data]; + *data = (*data >> 4) & (*data & 0x0F); ++data; } diff --git a/engines/kyra/screen_lol.h b/engines/kyra/screen_lol.h index f9cd7133de..4980a89694 100644 --- a/engines/kyra/screen_lol.h +++ b/engines/kyra/screen_lol.h @@ -109,7 +109,6 @@ private: uint8 *_levelOverlays[8]; - static const uint8 _paletteConvTable[256]; void mergeOverlay(int x, int y, int w, int h); void postProcessCursor(uint8 *data, int width, int height, int pitch); }; diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index e8597c8326..86680a7b76 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -3159,42 +3159,6 @@ const ScreenDim Screen_LoL::_screenDimTable16C[] = { const int Screen_LoL::_screenDimTableCount = ARRAYSIZE(Screen_LoL::_screenDimTable256C); -// 256 -> 16 color conversion table -const uint8 Screen_LoL::_paletteConvTable[256] = { - 0x0, 0x1, 0x0, 0x3, 0x0, 0x5, 0x0, 0x7, - 0x0, 0x9, 0x0, 0xB, 0x0, 0xD, 0x0, 0xF, - 0x1, 0x1, 0x1, 0x3, 0x1, 0x5, 0x1, 0x7, - 0x1, 0x9, 0x1, 0xB, 0x1, 0xD, 0x1, 0xF, - 0x2, 0x1, 0x2, 0x3, 0x2, 0x5, 0x2, 0x7, - 0x2, 0x9, 0x2, 0xB, 0x2, 0xD, 0x2, 0xF, - 0x3, 0x1, 0x3, 0x3, 0x3, 0x5, 0x3, 0x7, - 0x3, 0x9, 0x3, 0xB, 0x3, 0xD, 0x3, 0xF, - 0x4, 0x1, 0x4, 0x3, 0x4, 0x5, 0x4, 0x7, - 0x4, 0x9, 0x4, 0xB, 0x4, 0xD, 0x4, 0xF, - 0x5, 0x1, 0x5, 0x3, 0x5, 0x5, 0x5, 0x7, - 0x5, 0x9, 0x5, 0xB, 0x5, 0xD, 0x5, 0xF, - 0x6, 0x1, 0x6, 0x3, 0x6, 0x5, 0x6, 0x7, - 0x6, 0x9, 0x6, 0xB, 0x6, 0xD, 0x6, 0xF, - 0x7, 0x1, 0x7, 0x3, 0x7, 0x5, 0x7, 0x7, - 0x7, 0x9, 0x7, 0xB, 0x7, 0xD, 0x7, 0xF, - 0x8, 0x1, 0x8, 0x3, 0x8, 0x5, 0x8, 0x7, - 0x8, 0x9, 0x8, 0xB, 0x8, 0xD, 0x8, 0xF, - 0x9, 0x1, 0x9, 0x3, 0x9, 0x5, 0x9, 0x7, - 0x9, 0x9, 0x9, 0xB, 0x9, 0xD, 0x9, 0xF, - 0xA, 0x1, 0xA, 0x3, 0xA, 0x5, 0xA, 0x7, - 0xA, 0x9, 0xA, 0xB, 0xA, 0xD, 0xA, 0xF, - 0xB, 0x1, 0xB, 0x3, 0xB, 0x5, 0xB, 0x7, - 0xB, 0x9, 0xB, 0xB, 0xB, 0xD, 0xB, 0xF, - 0xC, 0x1, 0xC, 0x3, 0xC, 0x5, 0xC, 0x7, - 0xC, 0x9, 0xC, 0xB, 0xC, 0xD, 0xC, 0xF, - 0xD, 0x1, 0xD, 0x3, 0xD, 0x5, 0xD, 0x7, - 0xD, 0x9, 0xD, 0xB, 0xD, 0xD, 0xD, 0xF, - 0xE, 0x1, 0xE, 0x3, 0xE, 0x5, 0xE, 0x7, - 0xE, 0x9, 0xE, 0xB, 0xE, 0xD, 0xE, 0xF, - 0xF, 0x1, 0xF, 0x3, 0xF, 0x5, 0xF, 0x7, - 0xF, 0x9, 0xF, 0xB, 0xF, 0xD, 0xF, 0xF -}; - const char * const LoLEngine::_languageExt[] = { "ENG", "FRE", |