[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.94,2.95 script_v7he.cpp,2.87,2.88

Travis Howell kirben at users.sourceforge.net
Tue Sep 14 18:57:07 CEST 2004


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

Modified Files:
	script_v72he.cpp script_v7he.cpp 
Log Message:

Only palette is different


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.94
retrieving revision 2.95
diff -u -d -r2.94 -r2.95
--- script_v72he.cpp	14 Sep 2004 15:06:01 -0000	2.94
+++ script_v72he.cpp	15 Sep 2004 01:56:42 -0000	2.95
@@ -1361,7 +1361,7 @@
 			setPaletteFromPtr(pal, 256);
 		}
 		if (flags & 2) {
-			warning("unhandled Wiz image w/ rmap");
+			warning("unhandled Wiz image w/ rmap palette");
 		}
 		if (flags & 4) {
 			warning("printing Wiz image is unimplemented");
@@ -1392,11 +1392,7 @@
 			dst = pvs->getBackPixels(0, pvs->topline);
 		}
 		Common::Rect rScreen(0, 0, pvs->w, pvs->h);
-		if (flags & 2) {			
-			warning("unhandled Wiz image w/ rmap");
-		} else {
-			gdi.copyWizImage(dst, wizd, pvs->w, pvs->h, x1, y1, width, height, &rScreen);
-		}
+		gdi.copyWizImage(dst, wizd, pvs->w, pvs->h, x1, y1, width, height, &rScreen);
 
 		Common::Rect rImage(x1, y1, x1 + width, y1 + height);
 		if (rImage.intersects(rScreen)) {

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.87
retrieving revision 2.88
diff -u -d -r2.87 -r2.88
--- script_v7he.cpp	14 Sep 2004 15:06:01 -0000	2.87
+++ script_v7he.cpp	15 Sep 2004 01:56:42 -0000	2.88
@@ -761,6 +761,7 @@
 
 	num = getStackList(args, ARRAYSIZE(args));
 
+	debug(1, "o7_kernelSetFunctions: case %d (param count %d)", args[0], num);
 	switch (args[0]) {
 	case 1:
 		// Used to restore images when decorating cake in





More information about the Scummvm-git-logs mailing list