diff options
| author | Eugene Sandulenko | 2005-03-21 23:51:48 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-03-21 23:51:48 +0000 |
| commit | 0bcb0ac2579faf061ec677e0b4ac8e37697d6dc7 (patch) | |
| tree | 83eabb9bb748ae9b72430bf409968fae4cf25f37 /scumm/charset.cpp | |
| parent | 11a1f9bb00b5b008417e92e4d1c3fbfa8000d96d (diff) | |
| download | scummvm-rg350-0bcb0ac2579faf061ec677e0b4ac8e37697d6dc7.tar.gz scummvm-rg350-0bcb0ac2579faf061ec677e0b4ac8e37697d6dc7.tar.bz2 scummvm-rg350-0bcb0ac2579faf061ec677e0b4ac8e37697d6dc7.zip | |
Many MM NES fixes/improvements from Quietust:
o Doesn't crash when going upstairs. Now game is playable up to
the green tentacle
o Proper subtitles colors
o Room mask is decoded but doesn't affect sprites yet
o Inventory draw issues fixed
o Fix actors position when they're facing right
svn-id: r17191
Diffstat (limited to 'scumm/charset.cpp')
| -rw-r--r-- | scumm/charset.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 0ad0f40b43..98d0b8810d 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -1732,12 +1732,6 @@ static byte trNESSwedishTable[] = { 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5e }; -static byte NESColorTransition[] = { - 0x00, 0x02, 0x02, 0x03, 0x02, 0x01, 0x02, 0x03, - 0x00, 0x01, 0x02, 0x01, 0x00, 0x01, 0x00, 0x03 -}; - - CharsetRendererNES::CharsetRendererNES(ScummEngine *vm, Common::Language language) : CharsetRendererCommon(vm) { switch (language) { @@ -1823,7 +1817,7 @@ void CharsetRendererNES::drawBits1(const Graphics::Surface &s, byte *dst, const byte c1 = src[i + 8]; for (int j = 0; j < 8; j++) dst[j] = _vm->_NESPalette[((c0 >> (7 - j)) & 1) | (((c1 >> (7 - j)) & 1) << 1) | - (NESColorTransition[_color] << 2)]; + (_color ? 12 : 8)]; dst += s.pitch; } } |