minor cleanup

svn-id: r17692

5 files changed, 17 insertions, 17 deletions

diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index c0939cc947..f54420dd13 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -1147,8 +1147,8 @@ void ScummEngine_v100he::o100_wizImageOps() {
 		_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;
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 33579ccfbe..72d5cf3c63 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -586,8 +586,8 @@ void ScummEngine_v90he::o90_wizImageOps() {
 		_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;
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index 3bb13cb75c..61ad4aa241 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -1335,8 +1335,8 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
 		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;
 		
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp
index e47ff19adc..323e5431d5 100644
--- a/scumm/wiz_he.cpp
+++ b/scumm/wiz_he.cpp
@@ -995,7 +995,7 @@ uint8 *ScummEngine_v72he::drawWizImage(int resNum, int state, int x1, int y1, in
 			} 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 @@ void ScummEngine_v72he::drawWizComplexPolygon(int resNum, int state, int po_x, i
 	} 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_v80he::loadWizCursor(int resId) {
 }
 
 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 @@ void ScummEngine_v72he::displayWizComplexImage(const WizParameters *params) {
 	}
 
 	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 @@ void ScummEngine_v72he::displayWizComplexImage(const WizParameters *params) {
 		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);
diff --git a/scumm/wiz_he.h b/scumm/wiz_he.h
index c1cb826b7e..2dabd18412 100644
--- a/scumm/wiz_he.h
+++ b/scumm/wiz_he.h
@@ -67,7 +67,7 @@ struct WizParameters {
 	int unk_164;
 	int resDefImgW;
 	int resDefImgH;
-	int unk_178;
+	int maskImgResNum;
 	uint8 remapColor[256];
 	uint8 remapIndex[256];
 	int remapNum;
@@ -103,7 +103,8 @@ enum WizProcessFlags {
 	kWPFPaletteNum = 0x8000,
 	kWPFDstResNum = 0x10000,
 	kWPFFillColor = 0x20000,
-	kWPFClipBox2 = 0x40000
+	kWPFClipBox2 = 0x40000,
+	kWPFMaskImg = 0x80000
 };
 
 struct Wiz {