[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.407,2.408 script_v100he.cpp,2.104,2.105 script_v90he.cpp,2.202,2.203 sprite_he.cpp,1.111,1.112 sprite_he.h,1.27,1.28 wiz_he.cpp,2.31,2.32 wiz_he.h,2.12,2.13

kirben kirben at users.sourceforge.net
Thu Mar 31 14:52:50 CEST 2005


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

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

Rename paletteNum field for sprite in wizImages.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.407
retrieving revision 2.408
diff -u -d -r2.407 -r2.408
--- intern.h	31 Mar 2005 02:28:14 -0000	2.407
+++ intern.h	31 Mar 2005 22:51:53 -0000	2.408
@@ -924,7 +924,7 @@
 	int spriteInfoGet_resId(int spriteId);
 	int spriteInfoGet_resState(int spriteId);
 	int spriteInfoGet_groupNum(int spriteId);
-	int spriteInfoGet_field_14(int spriteId);
+	int spriteInfoGet_paletteNum(int spriteId);
 	int spriteInfoGet_zorderPriority(int spriteId);
 	int spriteInfoGet_grp_tx(int spriteId);
 	int spriteInfoGet_grp_ty(int spriteId);
@@ -949,7 +949,7 @@
 	int spriteGroupGet_scale_y_ratio_div(int spriteGroupId);
 	void spriteGroupGet_tx_ty(int spriteGroupId, int32 &tx, int32 &ty);
 
-	void spriteInfoSet_field_14(int spriteId, int value);
+	void spriteInfoSet_paletteNum(int spriteId, int value);
 	void spriteInfoSet_field_7C(int spriteId, int value);
 	void spriteInfoSet_field_80(int spriteId, int value);
 	void spriteInfoSet_resetSprite(int spriteId);

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.104
retrieving revision 2.105
diff -u -d -r2.104 -r2.105
--- script_v100he.cpp	31 Mar 2005 21:38:49 -0000	2.104
+++ script_v100he.cpp	31 Mar 2005 22:51:54 -0000	2.105
@@ -1262,8 +1262,8 @@
 		displayWizComplexImage(&_wizParams);
 		break;
 	case 57:
-		_wizParams.processFlags |= 0x8000;
-		_wizParams.unk_174 = pop();
+		_wizParams.processFlags |= kWPFPaletteNum;
+		_wizParams.img.paletteNum = pop();
 		break;
 	case 58:
 		_wizParams.processFlags |= 0x1000 | 0x100 | 0x2;
@@ -1900,7 +1900,7 @@
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			spriteInfoSet_field_14(spriteId, args[0]);
+			spriteInfoSet_paletteNum(spriteId, args[0]);
 		break;
 	case 59:
 		args[0] = pop();
@@ -2616,7 +2616,7 @@
 	case 57:
 		spriteId = pop();
 		if (spriteId)
-			push(spriteInfoGet_field_14(spriteId));
+			push(spriteInfoGet_paletteNum(spriteId));
 		else
 			push(0);
 		break;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.202
retrieving revision 2.203
diff -u -d -r2.202 -r2.203
--- script_v90he.cpp	31 Mar 2005 12:58:11 -0000	2.202
+++ script_v90he.cpp	31 Mar 2005 22:51:54 -0000	2.203
@@ -617,8 +617,8 @@
 		_wizParams.box.left = pop();
 		break;
 	case 40: // HE99+
-		_wizParams.processFlags |= 0x8000;
-		_wizParams.unk_174 = pop();
+		_wizParams.processFlags |= kWPFPaletteNum;
+		_wizParams.img.paletteNum = pop();
 		break;
 	case 46:
 		_wizParams.processFlags |= kWPFZoom;
@@ -923,7 +923,7 @@
 	case 56:
 		spriteId = pop();
 		if (spriteId)
-			push(spriteInfoGet_field_14(spriteId));
+			push(spriteInfoGet_paletteNum(spriteId));
 		else
 			push(0);
 		break;
@@ -1204,7 +1204,7 @@
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			spriteInfoSet_field_14(spriteId, args[0]);
+			spriteInfoSet_paletteNum(spriteId, args[0]);
 		break;
 	case 58: // HE 99+
 		args[0] = pop();

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- sprite_he.cpp	31 Mar 2005 02:28:14 -0000	1.111
+++ sprite_he.cpp	31 Mar 2005 22:51:54 -0000	1.112
@@ -297,10 +297,10 @@
 	return _spriteTable[spriteId].group_num;
 }
 
-int ScummEngine_v90he::spriteInfoGet_field_14(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_paletteNum(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	return _spriteTable[spriteId].field_14;
+	return _spriteTable[spriteId].paletteNum;
 }
 
 int ScummEngine_v90he::spriteInfoGet_zorderPriority(int spriteId) {
@@ -477,11 +477,11 @@
 //
 // spriteInfoSet functions
 //
-void ScummEngine_v90he::spriteInfoSet_field_14(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_paletteNum(int spriteId, int value) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	if (_spriteTable[spriteId].field_14 != value) {
-		_spriteTable[spriteId].field_14 = value;
+	if (_spriteTable[spriteId].paletteNum != value) {
+		_spriteTable[spriteId].paletteNum = value;
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
 	}
 }
@@ -747,7 +747,7 @@
 	_spriteTable[spriteId].delayAmount = 0;
 	_spriteTable[spriteId].delayCount = 0;
 	_spriteTable[spriteId].class_flags = 0;
-	_spriteTable[spriteId].field_14 = 0;
+	_spriteTable[spriteId].paletteNum = 0;
 	_spriteTable[spriteId].field_7C = 0;
 	_spriteTable[spriteId].field_80 = 0;
 	_spriteTable[spriteId].zorderPriority = 0;
@@ -1337,9 +1337,9 @@
 				continue;
 			}
 		}
-		if (spi->field_14) {
-			wiz.processFlags |= 0x8000;
-			wiz.unk_174 = spi->field_14;
+		if (spi->paletteNum) {
+			wiz.processFlags |= kWPFPaletteNum;
+			wiz.img.paletteNum = spi->paletteNum;
 		}
 		if (spi->res_id && spi->group_num && _spriteGroups[spi->group_num].field_20) {
 			wiz.processFlags |= 0x10000;

Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sprite_he.h	24 Mar 2005 03:47:54 -0000	1.27
+++ sprite_he.h	31 Mar 2005 22:51:54 -0000	1.28
@@ -71,7 +71,7 @@
 	int res_id;
 	int res_state;
 	int group_num;
-	int field_14;
+	int paletteNum;
 	int zorderPriority;
 	Common::Rect bbox;
 	int dx;

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.31
retrieving revision 2.32
diff -u -d -r2.31 -r2.32
--- wiz_he.cpp	31 Mar 2005 21:39:30 -0000	2.31
+++ wiz_he.cpp	31 Mar 2005 22:51:54 -0000	2.32
@@ -1206,8 +1206,9 @@
 }
 
 void ScummEngine_v72he::displayWizComplexImage(const WizParameters *params) {
-	if (params->processFlags & 0x80000) {
-		warning("displayWizComplexImage() unhandled flags = 0x80000");
+	int paletteNum = 0;
+	if (params->processFlags & kWPFPaletteNum) {
+		paletteNum = params->img.paletteNum;
 	}
 	int zoom = 256;
 	if (params->processFlags & kWPFZoom) {
@@ -1268,6 +1269,7 @@
 		pwi->state = state;
 		pwi->flags = flags;
 		pwi->unk = unk;
+		pwi->paletteNum = paletteNum;
 		++_wiz._imagesNum;
 	} else if (params->processFlags & (kWPFRotate | kWPFZoom)) {
 		drawWizComplexPolygon(params->img.resNum, state, po_x, po_y, unk, rotationAngle, zoom, r);
@@ -1285,6 +1287,7 @@
 		wi.state = state;
 		wi.flags = flags;
 		wi.unk = unk;
+		wi.paletteNum = paletteNum;
 		drawWizImage(rtImage, &wi);
 	}
 }

Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.12
retrieving revision 2.13
diff -u -d -r2.12 -r2.13
--- wiz_he.h	30 Mar 2005 11:49:53 -0000	2.12
+++ wiz_he.h	31 Mar 2005 22:51:54 -0000	2.13
@@ -42,6 +42,7 @@
 	int flags;
 	int state;
 	int unk;
+	int paletteNum;
 };
 
 struct WizParameters {
@@ -66,7 +67,6 @@
 	int unk_164;
 	int resDefImgW;
 	int resDefImgH;
-	int unk_174;
 	int unk_178;
 	uint8 remapColor[256];
 	uint8 remapIndex[256];
@@ -100,6 +100,7 @@
 	kWPFUseFile = 0x800,
 	kWPFUseDefImgWidth = 0x2000,
 	kWPFUseDefImgHeight = 0x4000,
+	kWPFPaletteNum = 0x8000,
 	kWPFFillColor = 0x20000,
 	kWPFClipBox2 = 0x40000
 };





More information about the Scummvm-git-logs mailing list