[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.38,2.39

kirben kirben at users.sourceforge.net
Tue Apr 5 08:21:46 CEST 2005


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

Modified Files:
	wiz_he.cpp 
Log Message:

Use correct buffer when capturing wizImage.
Puzzle in 1grademo and jokes/photo booth in pajama work now.


Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.38
retrieving revision 2.39
diff -u -d -r2.38 -r2.39
--- wiz_he.cpp	5 Apr 2005 14:42:36 -0000	2.38
+++ wiz_he.cpp	5 Apr 2005 15:21:18 -0000	2.39
@@ -773,14 +773,14 @@
 	return size;
 }
 
-void ScummEngine_v72he::captureWizImage(int resNum, const Common::Rect& r, bool frontBuffer, int compType) {
+void ScummEngine_v72he::captureWizImage(int resNum, const Common::Rect& r, bool backBuffer, int compType) {
 	debug(1, "ScummEngine_v72he::captureWizImage(%d, %d, [%d,%d,%d,%d])", resNum, compType, r.left, r.top, r.right, r.bottom);
 	uint8 *src = NULL;
 	VirtScreen *pvs = &virtscr[kMainVirtScreen];
-	if (frontBuffer) {
-		src = pvs->getPixels(0, 0);
-	} else {
+	if (backBuffer) {
 		src = pvs->getBackPixels(0, 0);
+	} else {
+		src = pvs->getPixels(0, 0);
 	}
 	Common::Rect rCapt(pvs->w, pvs->h);
 	if (rCapt.intersects(r)) {
@@ -1461,7 +1461,7 @@
 		displayWizComplexImage(params);
 		break;
 	case 2:
- 		captureWizImage(params->img.resNum, params->box, (params->img.flags & kWIFBlitToFrontVideoBuffer) == kWIFBlitToFrontVideoBuffer, params->compType);
+ 		captureWizImage(params->img.resNum, params->box, (params->img.flags & kWIFBlitToFrontVideoBuffer), params->compType);
 		break;
 	case 3:
 		if (params->processFlags & kWPFUseFile) {





More information about the Scummvm-git-logs mailing list