Rename sprite field for HE games.

svn-id: r17706

5 files changed, 16 insertions, 16 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index fd16abfa88..e77b1909a8 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -998,7 +998,7 @@ protected:
 	int spriteInfoGet_wizSize(int spriteId);
 	int spriteInfoGet_zoom(int spriteId);
 	int spriteInfoGet_delayAmount(int spriteId);
-	int spriteInfoGet_field_7C(int spriteId);
+	int spriteInfoGet_maskImgResNum(int spriteId);
 	int spriteInfoGet_field_80(int spriteId);
 	int spriteInfoGet_field_8C_90(int spriteId, int type);
 	void getSpriteImageDim(int spriteId, int32 &w, int32 &h);
@@ -1015,7 +1015,7 @@ protected:
 	void spriteGroupGet_tx_ty(int spriteGroupId, int32 &tx, int32 &ty);
 
 	void spriteInfoSet_paletteNum(int spriteId, int value);
-	void spriteInfoSet_field_7C(int spriteId, int value);
+	void spriteInfoSet_maskImgResNum(int spriteId, int value);
 	void spriteInfoSet_field_80(int spriteId, int value);
 	void spriteInfoSet_resetSprite(int spriteId);
 	void spriteInfoSet_resState(int spriteId, int value);
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index f54fe5dcd0..34a1790e62 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -1750,7 +1750,7 @@ void ScummEngine_v100he::o100_setSpriteInfo() {
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			spriteInfoSet_field_7C(spriteId, args[0]);
+			spriteInfoSet_maskImgResNum(spriteId, args[0]);
 		break;
 	case 16:
 		n = getStackList(args, ARRAYSIZE(args));
@@ -2490,7 +2490,7 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
 	case 7:
 		spriteId = pop();
 		if (spriteId)
-			push(spriteInfoGet_field_7C(spriteId));
+			push(spriteInfoGet_maskImgResNum(spriteId));
 		else
 			push(0);
 		break;
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index c887ff2ffa..79048c283d 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -894,7 +894,7 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
 	case 32:
 		spriteId = pop();
 		if (spriteId)
-			push(spriteInfoGet_field_7C(spriteId));
+			push(spriteInfoGet_maskImgResNum(spriteId));
 		else
 			push(0);
 		break;
@@ -1135,7 +1135,7 @@ void ScummEngine_v90he::o90_setSpriteInfo() {
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			spriteInfoSet_field_7C(spriteId, args[0]);
+			spriteInfoSet_maskImgResNum(spriteId, args[0]);
 		break;
 	case 29:
 		args[0] = pop();
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index 61ad4aa241..1e3f6333f6 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -360,10 +360,10 @@ int ScummEngine_v90he::spriteInfoGet_delayAmount(int spriteId) {
 	return _spriteTable[spriteId].delayAmount;
 }
 
-int ScummEngine_v90he::spriteInfoGet_field_7C(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_maskImgResNum(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	return _spriteTable[spriteId].field_7C;
+	return _spriteTable[spriteId].maskImgResNum;
 }
 
 int ScummEngine_v90he::spriteInfoGet_field_80(int spriteId) {
@@ -500,11 +500,11 @@ void ScummEngine_v90he::spriteInfoSet_paletteNum(int spriteId, int value) {
 	}
 }
 
-void ScummEngine_v90he::spriteInfoSet_field_7C(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_maskImgResNum(int spriteId, int value) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	if (_spriteTable[spriteId].field_7C != value) {
-		_spriteTable[spriteId].field_7C = value;
+	if (_spriteTable[spriteId].maskImgResNum != value) {
+		_spriteTable[spriteId].maskImgResNum = value;
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
 	}
 }
@@ -789,7 +789,7 @@ void ScummEngine_v90he::spriteInfoSet_resetSprite(int spriteId) {
 	_spriteTable[spriteId].delayCount = 0;
 	_spriteTable[spriteId].classFlags = 0;
 	_spriteTable[spriteId].paletteNum = 0;
-	_spriteTable[spriteId].field_7C = 0;
+	_spriteTable[spriteId].maskImgResNum = 0;
 	_spriteTable[spriteId].field_80 = 0;
 	_spriteTable[spriteId].zorderPriority = 0;
 	_spriteTable[spriteId].field_84 = 0;
@@ -1334,9 +1334,9 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
 		}
 		if (spr_flags & kSFNeedPaletteRemap)
 			wiz.img.flags |= kWIFRemapPalette;
-		if (spi->field_7C) {
+		if (spi->maskImgResNum) {
 			wiz.processFlags |= kWPFMaskImg;
-			wiz.maskImgResNum = spi->field_7C;
+			wiz.maskImgResNum = spi->maskImgResNum;
 		}
 		wiz.processFlags |= kWPFNewFlags;
 		
@@ -1409,7 +1409,7 @@ void ScummEngine_v90he::saveOrLoadSpriteData(Serializer *s, uint32 savegameVersi
 		MKLINE(SpriteInfo, imgFlags, sleInt32, VER(48)),
 		MKLINE(SpriteInfo, field_74, sleInt32, VER(48)),
 		MKLINE(SpriteInfo, delayAmount, sleInt32, VER(48)),
-		MKLINE(SpriteInfo, field_7C, sleInt32, VER(48)),
+		MKLINE(SpriteInfo, maskImgResNum, sleInt32, VER(48)),
 		MKLINE(SpriteInfo, field_80, sleInt32, VER(48)),
 		MKLINE(SpriteInfo, field_84, sleInt32, VER(48)),
 		MKLINE(SpriteInfo, classFlags, sleInt32, VER(48)),
diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h
index 6a6500c5ba..66cbe14068 100644
--- a/scumm/sprite_he.h
+++ b/scumm/sprite_he.h
@@ -75,7 +75,7 @@ struct SpriteInfo {
 	int32 imgFlags;
 	int32 field_74;
 	int32 delayAmount;
-	int32 field_7C;
+	int32 maskImgResNum;
 	int32 field_80;
 	int32 field_84;
 	int32 classFlags;