[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.205,2.206 script_v80he.cpp,2.75,2.76 script_v90he.cpp,2.155,2.156 sprite_he.cpp,1.47,1.48 sprite_he.h,1.11,1.12 wiz_he.cpp,2.3,2.4 wiz_he.h,2.3,2.4

[Gregory Montoir]

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

Modified Files:
	script_v72he.cpp script_v80he.cpp script_v90he.cpp 
	sprite_he.cpp sprite_he.h wiz_he.cpp wiz_he.h 
Log Message:
defined some flags for HE wiz ; it should make the code more readable

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.205
retrieving revision 2.206
diff -u -d -r2.205 -r2.206
--- script_v72he.cpp	22 Feb 2005 13:51:58 -0000	2.205
+++ script_v72he.cpp	24 Feb 2005 20:20:35 -0000	2.206
@@ -808,7 +808,7 @@
 	wi.resNum = pop();
 	wi.x1 = wi.y1 = 0;
 	wi.state = 0;
-	wi.flags = 4;
+	wi.flags = kWIFPrint;
 	drawWizImage(rtImage, &wi);
 }
 

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.75
retrieving revision 2.76
diff -u -d -r2.75 -r2.76
--- script_v80he.cpp	22 Feb 2005 13:51:59 -0000	2.75
+++ script_v80he.cpp	24 Feb 2005 20:20:35 -0000	2.76
@@ -588,7 +588,7 @@
 	wi.x1 = wi.y1 = pop();
 	wi.resNum = pop();
 	wi.state = 0;
-	wi.flags = 0x40;
+	wi.flags = kWIFIsPolygon;
 	displayWizImage(&wi);	
 }
 

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.155
retrieving revision 2.156
diff -u -d -r2.155 -r2.156
--- script_v90he.cpp	24 Feb 2005 11:49:07 -0000	2.155
+++ script_v90he.cpp	24 Feb 2005 20:20:35 -0000	2.156
@@ -500,12 +500,12 @@
 		_wizParams.processMode = 1;
 		break;
 	case 3:
-		_wizParams.processFlags |= 0x800;
+		_wizParams.processFlags |= kWPFUseFile;
 		_wizParams.processMode = 3;
 		copyScriptString(_wizParams.filename);
 		break;
 	case 4:
-		_wizParams.processFlags |= 0x800;
+		_wizParams.processFlags |= kWPFUseFile;
 		_wizParams.processMode = 4;
 		copyScriptString(_wizParams.filename);
 		_wizParams.unk_14C = pop();
@@ -520,15 +520,15 @@
 		_wizParams.compType = pop();
 		break;
 	case 6:
-		_wizParams.processFlags |= 0x400;
+		_wizParams.processFlags |= kWPFNewState;
 		_wizParams.img.state = pop();
 		break;
 	case 7:
-		_wizParams.processFlags |= 0x10;
+		_wizParams.processFlags |= kWPFRotate;
 		_wizParams.angle = pop();
 		break;
 	case 8:
-		_wizParams.processFlags |= 0x20;
+		_wizParams.processFlags |= kWPFNewFlags;
 		_wizParams.img.flags = pop();
 		break;
 	case 10:
@@ -571,7 +571,7 @@
 		}
 		break;
 	case 21:
-		_wizParams.processFlags |= 0x200;
+		_wizParams.processFlags |= kWPFClipBox;
 		_wizParams.box.bottom = pop();
 		_wizParams.box.right = pop();
 		_wizParams.box.top = pop();
@@ -582,7 +582,7 @@
 		pop();
 		break;
 	case 46:
-		_wizParams.processFlags |= 8;
+		_wizParams.processFlags |= kWPFZoom;
 		_wizParams.zoom = pop();
 		break;
 	case 52:
@@ -641,8 +641,8 @@
 		_wizParams.processMode = 8;
 		break;
 	case 200:
-		_wizParams.processFlags |= 0x23;
-		_wizParams.img.flags |= 0x40;
+		_wizParams.processFlags |= kWPFNewFlags | kWPFSetPos | 2;
+		_wizParams.img.flags |= kWIFIsPolygon;
 		_wizParams.unk_160 = _wizParams.img.y1 = _wizParams.img.x1 = pop();
 		break;
 	case 209:

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sprite_he.cpp	24 Feb 2005 12:22:14 -0000	1.47
+++ sprite_he.cpp	24 Feb 2005 20:20:35 -0000	1.48
@@ -1194,7 +1194,7 @@
 
 		spi->field_48 = wiz.img.state = res_state;
 		spi->field_4C = wiz.img.resNum = res_id;
-		wiz.processFlags = 0x401;
+		wiz.processFlags = kWPFNewState | kWPFSetPos;
 		spi->field_68 = spi->rot_angle;
 		spi->field_6C = spi->zoom;
 		spi->field_34 = wiz.img.x1;
@@ -1222,6 +1222,8 @@
 				// sar eax, 1
 				// mov ecx, eax
 				// neg ecx
+				
+				// => ecx = - something / 2
 
 				ebx = -1234;
 			}
@@ -1236,12 +1238,12 @@
 
 		wiz.img.flags = 0x10;
 		if (spr_flags & kSF23)
-			wiz.img.flags = 0x410;
+			wiz.img.flags |= kWIFFlipX;
 		if (spr_flags & kSF22)
-			wiz.img.flags |= 0x800;
+			wiz.img.flags |= kWIFFlipY;
 		if (spr_flags & kSF21) {
 			wiz.img.flags &= ~(0x11);
-			wiz.img.flags |= 8;
+			wiz.img.flags |= kWIFBlitToFrontVideoBuffer;
 		}
 		if (spi->field_54) {
 			wiz.img.flags |= 0x200;
@@ -1254,14 +1256,14 @@
 			wiz.processFlags |= 0x80000;
 			//wiz.field_178 = spi->field_7C; // FIXME
 		}
-		wiz.processFlags |= 0x20;
+		wiz.processFlags |= kWPFNewFlags;
 		
 		if (spr_flags & kSFRotated) {
-			wiz.processFlags |= 0x10;
+			wiz.processFlags |= kWPFRotate;
 			wiz.angle = spi->rot_angle;
 		}
 		if (spr_flags & kSFZoomed) {
-			wiz.processFlags |= 0x08;
+			wiz.processFlags |= kWPFZoom;
 			wiz.zoom = spi->zoom;
 		}
 		spi->imgFlags = wiz.img.flags;

Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sprite_he.h	24 Feb 2005 04:04:17 -0000	1.11
+++ sprite_he.h	24 Feb 2005 20:20:35 -0000	1.12
@@ -47,8 +47,8 @@
 	kSF19           = (1 << 18),
 	kSF20           = (1 << 19),
 	kSF21           = (1 << 20),
-	kSF22           = (1 << 21),
-	kSF23           = (1 << 22),
+	kSF22           = (1 << 21), // kSFYFlipped
+	kSF23           = (1 << 22), // kSFXFlipped
 	kSF24           = (1 << 23),
 	kSF25           = (1 << 24),
 	kSFBlitDirectly = (1 << 25),

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- wiz_he.cpp	1 Jan 2005 16:09:16 -0000	2.3
+++ wiz_he.cpp	24 Feb 2005 20:20:35 -0000	2.4
@@ -1252,7 +1252,7 @@
 		displayWizComplexImage(params);
 		break;
 	case 2:
- 		captureWizImage(rtImage, params->img.resNum, params->box, (params->img.flags & 8) == 8, params->compType);
+ 		captureWizImage(rtImage, params->img.resNum, params->box, (params->img.flags & kWIFBlitToFrontVideoBuffer) == kWIFBlitToFrontVideoBuffer, params->compType);
 		break;
 	case 3:
 		if (params->processFlags & 0x800) {

Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- wiz_he.h	1 Jan 2005 16:09:16 -0000	2.3
+++ wiz_he.h	24 Feb 2005 20:20:35 -0000	2.4
@@ -69,16 +69,27 @@
 	WizImage img;
 };
 
+enum WizImageFlags {
+	kWIFPrint = 0x4,
+	kWIFBlitToFrontVideoBuffer = 0x8,
+	kWIFBlitToMemBuffer = 0x20,
+	kWIFIsPolygon = 0x40,
+	kWIFFlipX = 0x400,
+	kWIFFlipY = 0x800
+};
+
+enum WizProcessFlags {
+	kWPFSetPos = 0x1,
+	kWPFZoom = 0x8,
+	kWPFRotate = 0x10,
+	kWPFNewFlags = 0x20,
+	kWPFClipBox = 0x200,
+	kWPFNewState = 0x400,
+	kWPFUseFile = 0x800
+};
+
 struct Wiz {
 	enum {
-		FW_PRINT   = 0x4,
-		FW_MEM     = 0x20,
-		FW_POLYGON = 0x40,
-		FW_XFLIP   = 0x400,
-		FW_YFLIP   = 0x800
-	};
-	
-	enum {
 		NUM_POLYGONS = 200,
 		NUM_IMAGES   = 255
 	};