[Scummvm-cvs-logs] CVS: scummvm/scumm wiz_he.cpp,2.84,2.85

[kirben]

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

Modified Files:
	wiz_he.cpp 
Log Message:

Set zorder to zero by default.


Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.84
retrieving revision 2.85
diff -u -d -r2.84 -r2.85
--- wiz_he.cpp	23 May 2005 03:41:27 -0000	2.84
+++ wiz_he.cpp	29 May 2005 12:00:00 -0000	2.85
@@ -1438,6 +1438,10 @@
 	if (params->processFlags & kWPFXmapNum) {
 		xmapNum = params->xmapNum;
 	}
+	int zorder = 0;
+	if (params->img.zorder) {
+		zorder = params->img.zorder;
+	}
 	int field_390 = 0;
 	if (params->processFlags & 0x200000) {
 		field_390 = params->img.field_390;
@@ -1476,7 +1480,7 @@
 		pwi->resNum = params->img.resNum;
 		pwi->x1 = po_x;
 		pwi->y1 = po_y;
-		pwi->zorder = params->img.zorder;
+		pwi->zorder = zorder;
 		pwi->state = state;
 		pwi->flags = flags;
 		pwi->xmapNum = xmapNum;
@@ -1492,7 +1496,7 @@
 			if (flags & kWIFIsPolygon) {
 				drawWizPolygon(params->img.resNum, state, po_x, flags, xmapNum, dstResNum, paletteNum); // XXX , VAR(VAR_WIZ_TCOLOR));
 			} else {
-				drawWizImage(params->img.resNum, state, po_x, po_y, params->img.zorder, xmapNum, field_390, r, flags, dstResNum, paletteNum);
+				drawWizImage(params->img.resNum, state, po_x, po_y, zorder, xmapNum, field_390, r, flags, dstResNum, paletteNum);
 			}
 		}
 	}