[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.403,2.404 script_v2.cpp,2.259,2.260

Eugene Sandulenko sev at users.sourceforge.net
Tue Mar 15 13:16:41 CET 2005


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

Modified Files:
	gfx.cpp script_v2.cpp 
Log Message:
Properly wipe out animation trails in MM NES. It appeared that it
just uses different constants for VAR_CURRENT_LIGHTS. So now it
uses proper double buffering as well


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.403
retrieving revision 2.404
diff -u -d -r2.403 -r2.404
--- gfx.cpp	15 Mar 2005 17:56:50 -0000	2.403
+++ gfx.cpp	15 Mar 2005 21:15:29 -0000	2.404
@@ -214,10 +214,7 @@
 		}
 	}
 
-	if (_features & GF_NES) // FIXME: is it really one-buffer?
-		initVirtScreen(kMainVirtScreen, 0, b, _screenWidth, h - b, false, true);
-	else
-		initVirtScreen(kMainVirtScreen, 0, b, _screenWidth, h - b, true, true);
+	initVirtScreen(kMainVirtScreen, 0, b, _screenWidth, h - b, true, true);
 	initVirtScreen(kTextVirtScreen, 0, 0, _screenWidth, b, false, false);
 	initVirtScreen(kVerbVirtScreen, 0, h, _screenWidth, _screenHeight - h, false, false);
 
@@ -1884,8 +1881,7 @@
 //		debug(0,"NES room data %i (not 128) pixels high!\n",height);
 		height = 16;
 	}
-	if (x > 63)
-	{
+	if (x > 63) {
 		debug(0,"NES tried to render invalid strip %i",stripnr);
 		return;
 	}

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.259
retrieving revision 2.260
diff -u -d -r2.259 -r2.260
--- script_v2.cpp	15 Mar 2005 04:16:25 -0000	2.259
+++ script_v2.cpp	15 Mar 2005 21:15:37 -0000	2.260
@@ -1274,9 +1274,10 @@
 			// 0 Darkness
 			// 1 Flashlight
 			// 2 Lighted area
-			if (a == 2)
+			// 11 and 12 are used by NES version
+			if (a == 2 || a == 11)
 				VAR(VAR_CURRENT_LIGHTS) = 11; 
-			else if (a == 1) 
+			else if (a == 1 || a == 12)
 				VAR(VAR_CURRENT_LIGHTS) = 4;
 			else 
 				VAR(VAR_CURRENT_LIGHTS) = 0;





More information about the Scummvm-git-logs mailing list