[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.146,2.147 scummvm.cpp,2.215,2.216
Max Horn
fingolfin at users.sourceforge.net
Thu Jun 5 17:17:09 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv27383
Modified Files:
gfx.cpp scummvm.cpp
Log Message:
cleanup
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.146
retrieving revision 2.147
diff -u -d -r2.146 -r2.147
--- gfx.cpp 5 Jun 2003 23:55:57 -0000 2.146
+++ gfx.cpp 6 Jun 2003 00:16:33 -0000 2.147
@@ -1329,24 +1329,30 @@
}
void Gdi::drawStripC64Background(byte *dst, int stripnr, int height) {
- for(int y = 0; y < (height >> 3); y++) {
- _C64Colors[3] = (_C64ColorMap[y + stripnr * (height >> 3)] & 7);
- for(int i = 0; i < 8; i++) {
- for(int j = 7; j >= 0; j--) {
- *(dst + (7 - j) + (y * 8 + i) * _vm->_screenWidth) =
- _C64Colors[((_C64CharMap[_C64PicMap[y + stripnr * (height >> 3)] * 8 + i] >> (j & 6)) & 3)];
+ int y, i, j;
+ height >>= 3;
+ for (y = 0; y < height; y++) {
+ _C64Colors[3] = (_C64ColorMap[y + stripnr * height] & 7);
+ for (i = 0; i < 8; i++) {
+ for (j = 7; j >= 0; j--) {
+ byte c = _C64CharMap[_C64PicMap[y + stripnr * height] * 8 + i] >> (j & 6);
+ dst[7 - j] = _C64Colors[c & 3];
}
+ dst += _vm->_screenWidth;
}
}
}
void Gdi::drawStripC64Mask(byte *dst, int stripnr, int height) {
- for(int y = 0; y < (height >> 3); y++) {
- for(int i = 0; i < 8; i++) {
- for(int j = 7; j >= 0; j--) {
- *(dst + (7 - j) + (y * 8 + i) * _vm->_screenWidth) =
- ((_C64MaskChar[_C64MaskMap[y + stripnr * (height >> 3)] * 8 + i] >> (j & 6)) & 3);
+ int y, i, j;
+ height >>= 3;
+ for (y = 0; y < height; y++) {
+ for (i = 0; i < 8; i++) {
+ for (j = 7; j >= 0; j--) {
+ byte c = _C64MaskChar[_C64MaskMap[y + stripnr * height] * 8 + i] >> (j & 6);
+ dst[7 - j] = c & 3;
}
+ dst += _vm->_screenWidth;
}
}
}
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.215
retrieving revision 2.216
diff -u -d -r2.215 -r2.216
--- scummvm.cpp 5 Jun 2003 17:22:15 -0000 2.215
+++ scummvm.cpp 6 Jun 2003 00:16:34 -0000 2.216
@@ -1420,9 +1420,9 @@
//
if (_features & GF_AFTER_V1) {
_IM00_offs = 0;
- for(i = 0; i < 4; i++){
- gdi._C64Colors[i] = roomptr[6 + i];
- }
+ for(i = 0; i < 4; i++){
+ gdi._C64Colors[i] = roomptr[6 + i];
+ }
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 10), gdi._C64CharMap, 256 * 8);
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 12), gdi._C64PicMap, roomptr[4] * roomptr[5]);
gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 14), gdi._C64ColorMap, roomptr[4] * roomptr[5]);
More information about the Scummvm-git-logs
mailing list