thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rewrite code a bit: personally I find it much easier to understand what the code does this way (the &6 trick is cute, but obfuscates the meaning of the code)

Browse source 
svn-id: r8360
This commit is contained in:
Max Horn 2003-06-06 20:55:39 +00:00
parent 0f9d447bd4
commit 1cae280e79
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
scumm/gfx.cpp
View file

@ -1335,45 +1335,45 @@ StripTable *Gdi::generateStripTable(const byte *src, int width, int height, Stri
} }
void Gdi::drawStripC64Background(byte *dst, int stripnr, int height) { void Gdi::drawStripC64Background(byte *dst, int stripnr, int height) {
int y, i, j;
height >>= 3; height >>= 3;
for (y = 0; y < height; y++) { for (int y = 0; y < height; y++) {
_C64Colors[3] = (_C64ColorMap[y + stripnr * height] & 7); _C64Colors[3] = (_C64ColorMap[y + stripnr * height] & 7);
for (i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
for (j = 7; j >= 0; j--) { byte c = _C64CharMap[_C64PicMap[y + stripnr * height] * 8 + i];
byte c = _C64CharMap[_C64PicMap[y + stripnr * height] * 8 + i] >> (j & 6); dst[0] = dst[1] = _C64Colors[(c >> 6) & 3];
dst[7 - j] = _C64Colors[c & 3]; dst[2] = dst[3] = _C64Colors[(c >> 4) & 3];
} dst[4] = dst[5] = _C64Colors[(c >> 2) & 3];
dst[6] = dst[7] = _C64Colors[(c >> 0) & 3];
dst += _vm->_screenWidth; dst += _vm->_screenWidth;
} }
} }
} }
void Gdi::drawStripC64Object(byte *dst, int stripnr, int width, int height) { void Gdi::drawStripC64Object(byte *dst, int stripnr, int width, int height) {
int y, i, j;
height >>= 3; height >>= 3;
width >>= 3; width >>= 3;
for (y = 0; y < height; y++) { for (int y = 0; y < height; y++) {
_C64Colors[3] = (_C64ObjectMap[y * width + stripnr + (width * height)] & 7); _C64Colors[3] = (_C64ObjectMap[y * width + stripnr + (width * height)] & 7);
for (i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
for (j = 7; j >= 0; j--) { byte c = _C64CharMap[_C64ObjectMap[y * width + stripnr] * 8 + i];
byte c = _C64CharMap[_C64ObjectMap[y * width + stripnr] * 8 + i] >> (j & 6); dst[0] = dst[1] = _C64Colors[(c >> 6) & 3];
dst[7 - j] = _C64Colors[c & 3]; dst[2] = dst[3] = _C64Colors[(c >> 4) & 3];
} dst[4] = dst[5] = _C64Colors[(c >> 2) & 3];
dst[6] = dst[7] = _C64Colors[(c >> 0) & 3];
dst += _vm->_screenWidth; dst += _vm->_screenWidth;
} }
} }
} }
void Gdi::drawStripC64Mask(byte *dst, int stripnr, int height) { void Gdi::drawStripC64Mask(byte *dst, int stripnr, int height) {
int y, i, j;
height >>= 3; height >>= 3;
for (y = 0; y < height; y++) { for (int y = 0; y < height; y++) {
for (i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
for (j = 7; j >= 0; j--) { byte c = _C64MaskChar[_C64MaskMap[y + stripnr * height] * 8 + i];
byte c = _C64MaskChar[_C64MaskMap[y + stripnr * height] * 8 + i] >> (j & 6); dst[0] = dst[1] = (c >> 6) & 3;
dst[7 - j] = c & 3; dst[2] = dst[3] = (c >> 4) & 3;
} dst[4] = dst[5] = (c >> 2) & 3;
dst[6] = dst[7] = (c >> 0) & 3;
dst += _vm->_screenWidth; dst += _vm->_screenWidth;
} }
} }