diff options
| author | Eugene Sandulenko | 2005-03-24 03:22:32 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-03-24 03:22:32 +0000 |
| commit | 9ab0962f6de96fb28dd7ee6b1589fb1b343dda7a (patch) | |
| tree | 4468cc52c76f506216933126c28fbf47176f6a84 /scumm/charset.cpp | |
| parent | b0a1228c439a1fbca682af4f4f87a9cb44cdbc69 (diff) | |
| download | scummvm-rg350-9ab0962f6de96fb28dd7ee6b1589fb1b343dda7a.tar.gz scummvm-rg350-9ab0962f6de96fb28dd7ee6b1589fb1b343dda7a.tar.bz2 scummvm-rg350-9ab0962f6de96fb28dd7ee6b1589fb1b343dda7a.zip | |
Lots of MM NES changes from Quietust and me
o Swap palette entries 0x00 and 0x1D in all necessary places. This gets
rid of gray background
o added a function NES_loadCostumeSet(int n) in order to do #1 for sprites
o Widen screen to 256 pixels and center narrow rooms in it
o Partial fix for subtitle rendering, now at least first line is
rendered with identation
svn-id: r17212
Diffstat (limited to 'scumm/charset.cpp')
| -rw-r--r-- | scumm/charset.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/charset.cpp b/scumm/charset.cpp index 57684f5441..9ba5619c43 100644 --- a/scumm/charset.cpp +++ b/scumm/charset.cpp @@ -1758,7 +1758,7 @@ void CharsetRendererNES::printChar(int chr) { if (chr == '@') return; - charPtr = _vm->_NESPatTable + _trTable[chr - 32] * 16; + charPtr = _vm->_NESPatTable[1] + _trTable[chr - 32] * 16; width = getCharWidth(chr); height = 8; @@ -1766,6 +1766,7 @@ void CharsetRendererNES::printChar(int chr) { origHeight = height; if (_firstChar) { + _left += 16; _str.left = _left; _str.top = _top; _str.right = _left; @@ -1809,7 +1810,7 @@ void CharsetRendererNES::drawChar(int chr, const Graphics::Surface &s, int x, in byte *charPtr, *dst; int width, height; - charPtr = _vm->_NESPatTable + _trTable[chr - 32] * 16; + charPtr = _vm->_NESPatTable[1] + _trTable[chr - 32] * 16; width = getCharWidth(chr); height = 8; @@ -1822,7 +1823,7 @@ void CharsetRendererNES::drawBits1(const Graphics::Surface &s, byte *dst, const byte c0 = src[i]; 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) | + dst[j] = _vm->_NESPalette[0][((c0 >> (7 - j)) & 1) | (((c1 >> (7 - j)) & 1) << 1) | (_color ? 12 : 8)]; dst += s.pitch; } |