[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.89,2.90 gfx.h,1.25,1.26
Max Horn
fingolfin at users.sourceforge.net
Sat May 10 17:29:07 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3558
Modified Files:
gfx.cpp gfx.h
Log Message:
cleanup
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.89
retrieving revision 2.90
diff -u -d -r2.89 -r2.90
--- gfx.cpp 10 May 2003 22:35:12 -0000 2.89
+++ gfx.cpp 11 May 2003 00:28:43 -0000 2.90
@@ -491,7 +491,7 @@
vs->bdirty[strip] = bottom;
offs = (top * _numStrips + _vm->_screenStartStrip + strip);
- _mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + offs;
+ byte *mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + offs;
bgbak_ptr = _vm->getResourceAddress(rtBuffer, 5) + (offs << 3);
backbuff_ptr = vs->screenPtr + (offs << 3);
@@ -499,7 +499,7 @@
if (numLinesToProcess) {
if ((_vm->_features & GF_AFTER_V6) || (_vm->VAR(_vm->VAR_CURRENT_LIGHTS) & LIGHTMODE_screen)) {
if (_vm->hasCharsetMask(strip << 3, top, (strip + 1) << 3, bottom))
- draw8ColWithMasking(backbuff_ptr, bgbak_ptr, numLinesToProcess, _mask_ptr);
+ draw8ColWithMasking(backbuff_ptr, bgbak_ptr, numLinesToProcess, mask_ptr);
else
draw8Col(backbuff_ptr, bgbak_ptr, numLinesToProcess);
} else {
@@ -843,6 +843,8 @@
assert(ptr);
assert(height > 0);
byte *backbuff_ptr, *bgbak_ptr, *smap_ptr;
+ byte *mask_ptr;
+
int i;
byte *zplane_list[9];
@@ -942,13 +944,12 @@
//////
if (_vm->_features & GF_AFTER_V2) {
- backbuff_ptr = vs->screenPtr + (y * _numStrips + x) * 8;
if (vs->alloctwobuffers)
bgbak_ptr = _vm->getResourceAddress(rtBuffer, vs->number + 5) + (y * _numStrips + x) * 8;
else
- bgbak_ptr = backbuff_ptr;
+ bgbak_ptr = vs->screenPtr + (y * _numStrips + x) * 8;
- _mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + (y * _numStrips + x);
+ mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + (y * _numStrips + x);
const int left = (stripnr << 3);
const int right = left + (numstrip << 3);
@@ -1006,14 +1007,14 @@
data = *src++;
do {
if (left <= theX && theX < right) {
- *_mask_ptr = data;
- _mask_ptr += _numStrips;
+ *mask_ptr = data;
+ mask_ptr += _numStrips;
}
theY++;
if (theY >= height) {
if (left <= theX && theX < right) {
- _mask_ptr -= _numStrips * height;
- _mask_ptr++;
+ mask_ptr -= _numStrips * height;
+ mask_ptr++;
}
theY = 0;
theX += 8;
@@ -1026,14 +1027,14 @@
data = *src++;
if (left <= theX && theX < right) {
- *_mask_ptr = data;
- _mask_ptr += _numStrips;
+ *mask_ptr = data;
+ mask_ptr += _numStrips;
}
theY++;
if (theY >= height) {
if (left <= theX && theX < right) {
- _mask_ptr -= _numStrips * height;
- _mask_ptr++;
+ mask_ptr -= _numStrips * height;
+ mask_ptr++;
}
theY = 0;
theX += 8;
@@ -1072,7 +1073,7 @@
else
bgbak_ptr = backbuff_ptr;
- _mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + (y * _numStrips + x);
+ mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + (y * _numStrips + x);
if (!(_vm->_features & GF_AFTER_V2)) {
if (_vm->_features & GF_16COLOR) {
@@ -1088,9 +1089,9 @@
if (vs->alloctwobuffers) {
if (_vm->hasCharsetMask(sx << 3, y, (sx + 1) << 3, bottom)) {
if (flag & dbClear || !lightsOn)
- clear8ColWithMasking(backbuff_ptr, height, _mask_ptr);
+ clear8ColWithMasking(backbuff_ptr, height, mask_ptr);
else
- draw8ColWithMasking(backbuff_ptr, bgbak_ptr, height, _mask_ptr);
+ draw8ColWithMasking(backbuff_ptr, bgbak_ptr, height, mask_ptr);
} else {
if (flag & dbClear || !lightsOn)
clear8Col(backbuff_ptr, height);
@@ -1125,11 +1126,11 @@
else
z_plane_ptr = zplane_list[1] + READ_LE_UINT16(zplane_list[1] + stripnr * 2 + 8);
for (i = 0; i < numzbuf; i++) {
- _mask_ptr_dest = _vm->getResourceAddress(rtBuffer, 9) + y * _numStrips + x + _imgBufOffs[i];
+ mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + y * _numStrips + x + _imgBufOffs[i];
if (useOrDecompress && (flag & dbAllowMaskOr))
- decompressMaskImgOr(_mask_ptr_dest, z_plane_ptr, height);
+ decompressMaskImgOr(mask_ptr, z_plane_ptr, height);
else
- decompressMaskImg(_mask_ptr_dest, z_plane_ptr, height);
+ decompressMaskImg(mask_ptr, z_plane_ptr, height);
}
} else {
for (i = 1; i < numzbuf; i++) {
@@ -1149,21 +1150,21 @@
else
offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 8);
- _mask_ptr_dest = _vm->getResourceAddress(rtBuffer, 9) + y * _numStrips + x + _imgBufOffs[i];
+ mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + y * _numStrips + x + _imgBufOffs[i];
if (offs) {
byte *z_plane_ptr = zplane_list[i] + offs;
if (useOrDecompress && (flag & dbAllowMaskOr)) {
- decompressMaskImgOr(_mask_ptr_dest, z_plane_ptr, height);
+ decompressMaskImgOr(mask_ptr, z_plane_ptr, height);
} else {
- decompressMaskImg(_mask_ptr_dest, z_plane_ptr, height);
+ decompressMaskImg(mask_ptr, z_plane_ptr, height);
}
} else {
if (!(useOrDecompress && (flag & dbAllowMaskOr)))
for (int h = 0; h < height; h++)
- _mask_ptr_dest[h * _numStrips] = 0;
+ mask_ptr[h * _numStrips] = 0;
// FIXME: needs better abstraction
}
}
Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gfx.h 10 May 2003 12:59:32 -0000 1.25
+++ gfx.h 11 May 2003 00:28:43 -0000 1.26
@@ -124,9 +124,6 @@
bool _useOrDecompress;
byte _cursorActive;
- byte *_mask_ptr;
- byte *_mask_ptr_dest;
-
byte _palette_mod;
byte _decomp_shr, _decomp_mask;
byte _transparentColor;
More information about the Scummvm-git-logs
mailing list