[Scummvm-cvs-logs] CVS: scummvm/scumm script_v90he.cpp,2.264,2.265 sprite_he.cpp,1.144,1.145 wiz_he.cpp,2.85,2.86

[kirben]

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

Modified Files:
	script_v90he.cpp sprite_he.cpp wiz_he.cpp 
Log Message:

Set zorder to zero by default.



Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.264
retrieving revision 2.265
diff -u -d -r2.264 -r2.265
--- script_v90he.cpp	28 May 2005 08:37:44 -0000	2.264
+++ script_v90he.cpp	29 May 2005 12:14:16 -0000	2.265
@@ -647,6 +647,10 @@
 		_wizParams.processFlags = 0;
 		_wizParams.remapNum = 0;
 		_wizParams.img.flags = 0;
+		_wizParams.field_184 = 0;
+		_wizParams.field_180 = 0;
+		_wizParams.spriteId = 0;
+		_wizParams.groupNum = 0;
 		break;
 	case 16: // HE99+
 		_wizParams.processFlags |= kWPFMaskImg;

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- sprite_he.cpp	23 May 2005 11:50:35 -0000	1.144
+++ sprite_he.cpp	29 May 2005 12:14:30 -0000	1.145
@@ -1334,6 +1334,7 @@
 		}
 
 		wiz.img.flags = kWIFMarkBufferDirty;
+		wiz.img.zorder = 0;
 		if (spr_flags & kSFXFlipped)
 			wiz.img.flags |= kWIFFlipX;
 		if (spr_flags & kSFYFlipped)

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.85
retrieving revision 2.86
diff -u -d -r2.85 -r2.86
--- wiz_he.cpp	29 May 2005 12:00:00 -0000	2.85
+++ wiz_he.cpp	29 May 2005 12:14:31 -0000	2.86
@@ -1438,10 +1438,6 @@
 	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;
@@ -1480,7 +1476,7 @@
 		pwi->resNum = params->img.resNum;
 		pwi->x1 = po_x;
 		pwi->y1 = po_y;
-		pwi->zorder = zorder;
+		pwi->zorder = params->img.zorder;
 		pwi->state = state;
 		pwi->flags = flags;
 		pwi->xmapNum = xmapNum;
@@ -1496,7 +1492,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, zorder, xmapNum, field_390, r, flags, dstResNum, paletteNum);
+				drawWizImage(params->img.resNum, state, po_x, po_y, params->img.zorder, xmapNum, field_390, r, flags, dstResNum, paletteNum);
 			}
 		}
 	}