[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.78,2.79
Max Horn
fingolfin at users.sourceforge.net
Sat May 10 05:24:02 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.175,1.176 simon.h,1.56,1.57 verb.cpp,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.79,2.80 gfx.h,1.24,1.25 object.cpp,1.87,1.88 verbs.cpp,1.34,1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1833
Modified Files:
gfx.cpp
Log Message:
cleanup
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.78
retrieving revision 2.79
diff -u -d -r2.78 -r2.79
--- gfx.cpp 9 May 2003 06:03:48 -0000 2.78
+++ gfx.cpp 10 May 2003 12:23:02 -0000 2.79
@@ -933,11 +933,12 @@
_vertStripNextInc = h * _vm->_realWidth - 1;
+ sx = x;
+ if (vs->scrollable)
+ sx -= vs->xstart >> 3;
+
do {
CHECK_HEAP;
- sx = x;
- if (vs->scrollable)
- sx -= vs->xstart >> 3;
if (sx < 0)
goto next_iter;
@@ -959,14 +960,12 @@
_mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + (y * _numStrips + x);
- if (_vm->_features & GF_SMALL_HEADER) {
- if (_vm->_features & GF_AFTER_V2) {
- decodeStripOldEGA(bgbak_ptr, roomptr + _vm->_egaStripOffsets[stripnr], h, stripnr);
- } else if (_vm->_features & GF_16COLOR) {
- decodeStripEGA(bgbak_ptr, smap_ptr + READ_LE_UINT16(smap_ptr + stripnr * 2 + 2), h);
- } else {
- useOrDecompress = decompressBitmap(bgbak_ptr, smap_ptr + READ_LE_UINT32(smap_ptr + stripnr * 4 + 4), h);
- }
+ if (_vm->_features & GF_AFTER_V2) {
+ decodeStripOldEGA(bgbak_ptr, roomptr + _vm->_egaStripOffsets[stripnr], h, stripnr);
+ } else if (_vm->_features & GF_16COLOR) {
+ decodeStripEGA(bgbak_ptr, smap_ptr + READ_LE_UINT16(smap_ptr + stripnr * 2 + 2), h);
+ } else if (_vm->_features & GF_SMALL_HEADER) {
+ useOrDecompress = decompressBitmap(bgbak_ptr, smap_ptr + READ_LE_UINT32(smap_ptr + stripnr * 4 + 4), h);
} else {
useOrDecompress = decompressBitmap(bgbak_ptr, smap_ptr + READ_LE_UINT32(smap_ptr + stripnr * 4 + 8), h);
}
@@ -1061,6 +1060,7 @@
next_iter:
CHECK_HEAP;
x++;
+ sx++;
stripnr++;
} while (--numstrip);
}
@@ -1158,6 +1158,10 @@
}
}
+ // Note - at this point, "bitmap" will be equal to "zplane"
+ // This is true for any V2 bitmap data. We can make use of that fact to write
+ // a generic drawBitmapV2, which will work for objects, too, and not need this
+ // function and the tables it computes at all.
x = 0;
y = 128;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.175,1.176 simon.h,1.56,1.57 verb.cpp,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.79,2.80 gfx.h,1.24,1.25 object.cpp,1.87,1.88 verbs.cpp,1.34,1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list