[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.90,2.91 script_v2.cpp,2.60,2.61

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv24841

Modified Files:
	gfx.cpp script_v2.cpp 
Log Message:
cleanup / tweaks (V2 masking, at least in Zakdemo, seems not to work properly, though)

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.90
retrieving revision 2.91
diff -u -d -r2.90 -r2.91
--- gfx.cpp	11 May 2003 00:28:43 -0000	2.90
+++ gfx.cpp	11 May 2003 11:13:24 -0000	2.91
@@ -871,7 +871,7 @@
 
 	if (_disable_zbuffer)
 		numzbuf = 0;
-	else if (_numZBuffer <= 1)
+	else if (_numZBuffer <= 1 || (_vm->_features & GF_AFTER_V2))
 		numzbuf = _numZBuffer;
 	else {
 		numzbuf = _numZBuffer;
@@ -949,7 +949,7 @@
 		else
 			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) + _imgBufOffs[1];
 
 		const int left = (stripnr << 3);
 		const int right = left + (numstrip << 3);
@@ -1013,8 +1013,7 @@
 					theY++;
 					if (theY >= height) {
 						if (left <= theX && theX < right) {
-							mask_ptr -= _numStrips * height;
-							mask_ptr++;
+							mask_ptr -= _numStrips * height - 1;
 						}
 						theY = 0;
 						theX += 8;
@@ -1033,8 +1032,7 @@
 					theY++;
 					if (theY >= height) {
 						if (left <= theX && theX < right) {
-							mask_ptr -= _numStrips * height;
-							mask_ptr++;
+							mask_ptr -= _numStrips * height - 1;
 						}
 						theY = 0;
 						theX += 8;
@@ -1073,8 +1071,6 @@
 		else
 			bgbak_ptr = backbuff_ptr;
 
-		mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + (y * _numStrips + x);
-
 		if (!(_vm->_features & GF_AFTER_V2)) {
 			if (_vm->_features & GF_16COLOR) {
 				decodeStripEGA(bgbak_ptr, smap_ptr + READ_LE_UINT16(smap_ptr + stripnr * 2 + 2), height);
@@ -1084,6 +1080,8 @@
 				useOrDecompress = decompressBitmap(bgbak_ptr, smap_ptr + READ_LE_UINT32(smap_ptr + stripnr * 4 + 8), height);
 			}
 		}
+
+		mask_ptr = _vm->getResourceAddress(rtBuffer, 9) + (y * _numStrips + x);
 
 		CHECK_HEAP;
 		if (vs->alloctwobuffers) {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.60
retrieving revision 2.61
diff -u -d -r2.60 -r2.61
--- script_v2.cpp	11 May 2003 00:03:03 -0000	2.60
+++ script_v2.cpp	11 May 2003 11:13:24 -0000	2.61
@@ -821,8 +821,12 @@
 	// TODO
 	switch(fetchScriptByte()) {
 	case 1:
+		// TODO - execute the sentence
+		_sentenceNum--;
 		break;
 	case 2:
+		// TODO - print the sentence
+		_sentenceNum--;
 		break;
 	}
 }