[Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.130,2.131 script_v90he.cpp,2.230,2.231 sprite_he.cpp,1.128,1.129 wiz_he.cpp,2.60,2.61 wiz_he.h,2.16,2.17

[Gregory Montoir]

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

Modified Files:
	script_v100he.cpp script_v90he.cpp sprite_he.cpp wiz_he.cpp 
	wiz_he.h 
Log Message:
minor cleanup

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.130
retrieving revision 2.131
diff -u -d -r2.130 -r2.131
--- script_v100he.cpp	18 Apr 2005 11:44:01 -0000	2.130
+++ script_v100he.cpp	19 Apr 2005 17:54:57 -0000	2.131
@@ -1147,8 +1147,8 @@
 		_wizParams.img.x1 = pop();
 		break;
 	case 7:
-		_wizParams.processFlags |= 0x80000;
-		_wizParams.unk_178  = pop();
+		_wizParams.processFlags |= kWPFMaskImg;
+		_wizParams.maskImgResNum = pop();
 		break;
 	case 11:
 		_wizParams.processFlags |= kWPFClipBox | 0x100;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.230
retrieving revision 2.231
diff -u -d -r2.230 -r2.231
--- script_v90he.cpp	16 Apr 2005 14:22:14 -0000	2.230
+++ script_v90he.cpp	19 Apr 2005 17:54:57 -0000	2.231
@@ -586,8 +586,8 @@
 		_wizParams.img.flags = 0;
 		break;
 	case 16: // HE99+
-		_wizParams.processFlags |= 0x80000;
-		_wizParams.unk_178  = pop();
+		_wizParams.processFlags |= kWPFMaskImg;
+		_wizParams.maskImgResNum = pop();
 		break;
 	case 19:
 		_wizParams.processFlags |= kWPFSetPos;

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- sprite_he.cpp	15 Apr 2005 15:19:41 -0000	1.128
+++ sprite_he.cpp	19 Apr 2005 17:54:59 -0000	1.129
@@ -1335,8 +1335,8 @@
 		if (spr_flags & kSFNeedPaletteRemap)
 			wiz.img.flags |= kWIFRemapPalette;
 		if (spi->field_7C) {
-			wiz.processFlags |= 0x80000;
-			wiz.unk_178 = spi->field_7C;
+			wiz.processFlags |= kWPFMaskImg;
+			wiz.maskImgResNum = spi->field_7C;
 		}
 		wiz.processFlags |= kWPFNewFlags;
 		

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.60
retrieving revision 2.61
diff -u -d -r2.60 -r2.61
--- wiz_he.cpp	17 Apr 2005 09:45:38 -0000	2.60
+++ wiz_he.cpp	19 Apr 2005 17:55:08 -0000	2.61
@@ -995,7 +995,7 @@
 			} else {
 				return 0;
 			}
-		} else if (_wiz._rectOverrideEnabled == true) {
+		} else if (_wiz._rectOverrideEnabled) {
 			if (rScreen.intersects(_wiz._rectOverride)) {
 				rScreen.clip(_wiz._rectOverride);
 			} else {
@@ -1149,10 +1149,9 @@
 	} else {
 		warning("drawWizComplexPolygon() angle partially implemented");
 
+		angle %= 360;
 		if (angle < 0) {
-			angle = 360 - (angle / 360);
-		} else {
-			angle /= 360;
+			angle += 360;
 		}
 
 		Common::Rect bounds;
@@ -1339,9 +1338,9 @@
 }
 
 void ScummEngine_v72he::displayWizComplexImage(const WizParameters *params) {
-	int unk_178 = 0;
-	if (params->processFlags & 0x80000) {
-		unk_178  = params->unk_178;
+	int maskImgResNum = 0;
+	if (params->processFlags & kWPFMaskImg) {
+		maskImgResNum = params->maskImgResNum;
 		warning("displayWizComplexImage() unhandled flag 0x80000");
 	}
 	int paletteNum = 0;
@@ -1399,7 +1398,7 @@
 	}
 
 	if (_fullRedraw && dstResNum == 0) {
-		if (unk_178 != 0 || (params->processFlags & (kWPFZoom | kWPFRotate)))
+		if (maskImgResNum != 0 || (params->processFlags & (kWPFZoom | kWPFRotate)))
 			error("Can't do this command in the enter script.");
 
 		assert(_wiz._imagesNum < ARRAYSIZE(_wiz._images));
@@ -1413,7 +1412,7 @@
 		pwi->paletteNum = paletteNum;
 		++_wiz._imagesNum;
 	} else {
-		if (unk_178 != 0) {
+		if (maskImgResNum != 0) {
 			// TODO
 		} else if (params->processFlags & (kWPFZoom | kWPFRotate)) {
 			drawWizComplexPolygon(params->img.resNum, state, po_x, po_y, xmapNum, rotationAngle, zoom, r, flags, dstResNum, paletteNum);

Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -d -r2.16 -r2.17
--- wiz_he.h	7 Apr 2005 10:43:51 -0000	2.16
+++ wiz_he.h	19 Apr 2005 17:55:09 -0000	2.17
@@ -67,7 +67,7 @@
 	int unk_164;
 	int resDefImgW;
 	int resDefImgH;
-	int unk_178;
+	int maskImgResNum;
 	uint8 remapColor[256];
 	uint8 remapIndex[256];
 	int remapNum;
@@ -103,7 +103,8 @@
 	kWPFPaletteNum = 0x8000,
 	kWPFDstResNum = 0x10000,
 	kWPFFillColor = 0x20000,
-	kWPFClipBox2 = 0x40000
+	kWPFClipBox2 = 0x40000,
+	kWPFMaskImg = 0x80000
 };
 
 struct Wiz {