[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.160,1.161 gfx.cpp,2.402,2.403 resource_v2.cpp,1.44,1.45 scumm.cpp,1.366,1.367

Eugene Sandulenko sev at users.sourceforge.net
Tue Mar 15 09:58:01 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2893

Modified Files:
	costume.cpp gfx.cpp resource_v2.cpp scumm.cpp 
Log Message:
Minor NES-related fixes
  o Actors do not leave trails, though background isn't restored since
    that code always uses two buffers and nes isn't. I have to switch it to
    use two
  o Add Swedish version of MM NES
  o Code formatting fixes


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- costume.cpp	15 Mar 2005 04:05:14 -0000	1.160
+++ costume.cpp	15 Mar 2005 17:56:49 -0000	1.161
@@ -709,9 +709,9 @@
 		byte tile = ptr[1];
 		byte palette = (ptr[2] & 0x03) << 2;
 		int8 x = ptr[2];	x >>= 2;
+
 		ptr += 3;
-		if (flipped)
-		{
+		if (flipped) {
 			mask = (mask == 0x80) ? 0x01 : 0x80;
 			x = -x;
 		}
@@ -742,7 +742,11 @@
 		if (bottom < _actorY + y + 8)
 			bottom = _actorY + y + 8;
 	}
-	_vm->markRectAsDirty(kMainVirtScreen,left,right,top,bottom);
+
+	_draw_top = top;
+	_draw_bottom = bottom;
+
+	_vm->markRectAsDirty(kMainVirtScreen, left, right, top, bottom, _actorID);
 }
 
 byte CostumeRenderer::drawLimb(const Actor *a, int limb) {

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.402
retrieving revision 2.403
diff -u -d -r2.402 -r2.403
--- gfx.cpp	15 Mar 2005 08:21:48 -0000	2.402
+++ gfx.cpp	15 Mar 2005 17:56:50 -0000	2.403
@@ -1424,10 +1424,11 @@
 		if (_vm->_version == 1) {
 			if (_vm->_features & GF_NES) {
 				//mask_ptr = getMaskBuffer(x, y, 1);
-				for (int ii = 0; ii < height; ii++) {
-				//	*mask_ptr = ?	// what sort of data needs to go into the mask?
-					//mask_ptr += _numStrips;
-				}
+				//for (int ii = 0; ii < height; ii++) {
+				//	for (int jj = 0; jj < width; jj++)
+				//		mask_ptr[jj] = 0xff;
+				//	mask_ptr += _numStrips;
+				//}
 			} else {
 				mask_ptr = getMaskBuffer(x, y, 1);
 				drawStripC64Mask(mask_ptr, stripnr, width, height);

Index: resource_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- resource_v2.cpp	13 Mar 2005 23:18:56 -0000	1.44
+++ resource_v2.cpp	15 Mar 2005 17:56:50 -0000	1.45
@@ -173,7 +173,7 @@
 			break;
 		case 0x4643:
 			if (!(_features & GF_NES))
-				error("Use maniacnes target");
+				error("Use maniac target");
 			printf("NES V1 game detected\n");
 			_version = 1;
 			readClassicIndexFile();

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- scumm.cpp	15 Mar 2005 05:28:20 -0000	1.366
+++ scumm.cpp	15 Mar 2005 17:56:50 -0000	1.367
@@ -418,6 +418,8 @@
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
 	{"51305e929e330e24a75a0351c8f9975e", "Freddi Fish 2: The Case of the Haunted Schoolhouse (Updated)", GID_HEGAME, 6, 99, 30, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0, 0},
+	{"545432361b874eebe6bb70c5b44db0be", "Maniac Mansion (NES SW)", GID_MANIAC, 1, 0, 25, MDT_NONE,
+	 GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING | GF_NES, 0, 0},
 	{"6a30a07f353a75cdc602db27d73e1b42", "Putt-Putt Joins The Parade (Windows)", GID_HEGAME, 6, 70, 13, MDT_NONE,
 	 GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES | GF_WINDOWS, 0, 0},
 	{"6af2419fe3db5c2fdb091ae4e5833770", "Putt-Putt Enters the Race (Demo Alt)", GID_FREDDI4, 6, 98, 61, MDT_NONE,





More information about the Scummvm-git-logs mailing list