[Scummvm-cvs-logs] SF.net SVN: scummvm:[42443] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Jul 13 19:48:13 CEST 2009
Revision: 42443
http://scummvm.svn.sourceforge.net/scummvm/?rev=42443&view=rev
Author: lordhoto
Date: 2009-07-13 17:48:13 +0000 (Mon, 13 Jul 2009)
Log Message:
-----------
Got rid of Screen_LoL::_paletteConvTable.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/screen_lol.cpp
scummvm/trunk/engines/kyra/screen_lol.h
scummvm/trunk/engines/kyra/staticres.cpp
Modified: scummvm/trunk/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.cpp 2009-07-13 17:29:12 UTC (rev 42442)
+++ scummvm/trunk/engines/kyra/screen_lol.cpp 2009-07-13 17:48:13 UTC (rev 42443)
@@ -912,7 +912,7 @@
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 @@
while (h--) {
for (int i = 0; i < w; ++i) {
if (*data != _cursorColorKey)
- *data = _paletteConvTable[*data];
+ *data = (*data >> 4) & (*data & 0x0F);
++data;
}
Modified: scummvm/trunk/engines/kyra/screen_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.h 2009-07-13 17:29:12 UTC (rev 42442)
+++ scummvm/trunk/engines/kyra/screen_lol.h 2009-07-13 17:48:13 UTC (rev 42443)
@@ -109,7 +109,6 @@
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);
};
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2009-07-13 17:29:12 UTC (rev 42442)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2009-07-13 17:48:13 UTC (rev 42443)
@@ -3159,42 +3159,6 @@
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",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list