[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.56,1.57 wiz_he.cpp,2.5,2.6 wiz_he.h,2.5,2.6

kirben kirben at users.sourceforge.net
Fri Feb 25 03:49:32 CET 2005


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

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

Update WizParameters struct, to match pajama3.


Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- sprite_he.cpp	25 Feb 2005 11:23:26 -0000	1.56
+++ sprite_he.cpp	25 Feb 2005 11:45:25 -0000	1.57
@@ -1215,7 +1215,6 @@
 				pts[0].x = pts[0].y = pts[1].y = pts[3].x = -w / 2;
 				pts[2].y = pts[3].y = h / 2 - 1;
 
-				// transform points
 				if (spi->flags & kSFZoomed) {
 					for (int j = 0; j < 4; ++j) {
 						pts[j].x = pts[i].x * zoom / 256;
@@ -1257,7 +1256,7 @@
 			wiz.img.flags |= 2;
 		if (spi->field_7C) {
 			wiz.processFlags |= 0x80000;
-			//wiz.field_178 = spi->field_7C; // FIXME
+			wiz.unk_178 = spi->field_7C;
 		}
 		wiz.processFlags |= kWPFNewFlags;
 		
@@ -1286,11 +1285,11 @@
 		}
 		if (spi->field_14) {
 			wiz.processFlags |= 0x8000;
-			//wiz.field_174 = spi->field_14; // FIXME
+			wiz.unk_174 = spi->field_14;
 		}
 		if (spi->res_id && spi->group_num && _spriteGroups[spi->group_num].field_20) {
 			wiz.processFlags |= 0x1000;
-			//wiz.field_380 = _spriteGroups[spi->group_num].field_20; // FIXME
+			wiz.unk_380 = _spriteGroups[spi->group_num].field_20;
 		}
 		displayWizComplexImage(&wiz);
 	}

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- wiz_he.cpp	25 Feb 2005 11:23:26 -0000	2.5
+++ wiz_he.cpp	25 Feb 2005 11:45:25 -0000	2.6
@@ -88,7 +88,7 @@
 	wp->vert[4].x = vert1x;
 	wp->vert[4].y = vert1y;
 	wp->id = id;
-	wp->numVerts = 5;  
+	wp->numVerts = 5;
 	wp->flag = flag;	
 
 	polygonCalcBoundBox(wp->vert, wp->numVerts, wp->bound);

Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- wiz_he.h	25 Feb 2005 11:23:27 -0000	2.5
+++ wiz_he.h	25 Feb 2005 11:45:25 -0000	2.6
@@ -63,9 +63,15 @@
 	int zoom;
 	int unk_15C;
 	int unk_160;
+	int unk_164;
+	int unk_16C;
+	int unk_170;
+	int unk_174;
+	int unk_178;
 	uint8 remapColor[256];
 	uint8 remapIndex[256];
 	int remapNum;
+	int unk_380;
 	WizImage img;
 };
 





More information about the Scummvm-git-logs mailing list