Rename HE sprite flag kSF31 -> kSFImageless and corresponding functions.

svn-id: r16929

5 files changed, 15 insertions, 15 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index fb9e44db84..e60891efd7 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -885,7 +885,7 @@ protected:
 	int spriteInfoGet_flags_20(int spriteId);
 	int spriteInfoGet_flagYFlipped(int spriteId);
 	int spriteInfoGet_flagXFlipped(int spriteId);	
-	int spriteInfoGet_flags_31(int spriteId);
+	int spriteInfoGet_flagHasImage(int spriteId);
 	int spriteInfoGet_resId(int spriteId);
 	int spriteInfoGet_resState(int spriteId);
 	int spriteInfoGet_groupNum(int spriteId);
@@ -935,7 +935,7 @@ protected:
 	void spriteInfoSet_flag20(int spriteId, int value);
 	void spriteInfoSet_flagYFlipped(int spriteId, int value);
 	void spriteInfoSet_flagXFlipped(int spriteId, int value);
-	void spriteInfoSet_flag31(int spriteId, int value);
+	void spriteInfoSet_flagHasImage(int spriteId, int value);
 	void spriteInfoSet_field_78_64(int spriteId, int value);
 	void spriteInfoSet_setClassFlags(int spriteId, int value);
 	void spriteInfoSet_setClassFlag(int spriteId, int classId, int toggle);
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 5c08f46655..eff0182148 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -1686,7 +1686,7 @@ void ScummEngine_v100he::o100_setSpriteInfo() {
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			spriteInfoSet_flag31(spriteId, args[0]);
+			spriteInfoSet_flagHasImage(spriteId, args[0]);
 		break;
 	case 38:
 		args[0] = pop();
@@ -2416,7 +2416,7 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
 	case 32:
 		spriteId = pop();
 		if (spriteId)
-			push(spriteInfoGet_flags_31(spriteId));
+			push(spriteInfoGet_flagHasImage(spriteId));
 		else
 			push(1);
 		break;
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index cb9d40c9d8..06a27e20df 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -867,7 +867,7 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
 	case 38:
 		spriteId = pop();
 		if (spriteId)
-			push(spriteInfoGet_flags_31(spriteId));
+			push(spriteInfoGet_flagHasImage(spriteId));
 		else
 			push(1);
 		break;
@@ -1134,7 +1134,7 @@ void ScummEngine_v90he::o90_setSpriteInfo() {
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			spriteInfoSet_flag31(spriteId, args[0]);
+			spriteInfoSet_flagHasImage(spriteId, args[0]);
 		break;
 	case 43:
 		args[1] = pop();
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index 62555799fa..30f045983a 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -205,10 +205,10 @@ int ScummEngine_v90he::spriteInfoGet_flagXFlipped(int spriteId) {
 	return ((_spriteTable[spriteId].flags & kSFXFlipped) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_31(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagHasImage(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	return ((_spriteTable[spriteId].flags & kSF31) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSFImageless) != 0) ? 1 : 0;
 }
 
 int ScummEngine_v90he::spriteInfoGet_resId(int spriteId) {
@@ -604,14 +604,14 @@ void ScummEngine_v90he::spriteInfoSet_flagXFlipped(int spriteId, int value) {
 		_spriteTable[spriteId].flags &= ~(kSFChanged | kSFXFlipped | kSFBlitDirectly);
 }
 
-void ScummEngine_v90he::spriteInfoSet_flag31(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagHasImage(int spriteId, int value) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	// Note that condition is inverted
 	if (!value)
-		_spriteTable[spriteId].flags |= kSF31;
+		_spriteTable[spriteId].flags |= kSFImageless;
 	else
-		_spriteTable[spriteId].flags &= ~(kSFChanged | kSF31);
+		_spriteTable[spriteId].flags &= ~(kSFChanged | kSFImageless);
 }
 
 void ScummEngine_v90he::spriteInfoSet_field_78_64(int spriteId, int value) {
@@ -739,7 +739,7 @@ void ScummEngine_v90he::spriteAddImageToList(int spriteId, int imageNum, int *sp
 
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
 	} else {
-		_spriteTable[spriteId].flags &= ~(kSF31);
+		_spriteTable[spriteId].flags &= ~(kSFImageless);
 		_spriteTable[spriteId].flags |= kSFChanged | kSFBlitDirectly;
 		_spriteTable[spriteId].field_4C = 0;
 		_spriteTable[spriteId].field_48 = 0;
@@ -1080,7 +1080,7 @@ void ScummEngine_v90he::spritesBlitToScreen() {
 
 	for (int i = 0; i < _numSpritesToProcess; ++i) {
 		SpriteInfo *spi = _activeSpritesTable[i];
-		if (!(spi->flags & kSF31) && (spi->flags & kSFChanged)) {
+		if (!(spi->flags & kSFImageless) && (spi->flags & kSFChanged)) {
 			spi->flags &= ~kSFChanged;
 			if (spi->bbox.left <= spi->bbox.right && spi->bbox.top <= spi->bbox.bottom) {
 				if (spi->flags & kSFBlitDirectly) {
@@ -1219,7 +1219,7 @@ void ScummEngine_v90he::spritesSortActiveSprites() {
 			if (!spi->flags & kSFXFlipped) {
 				if (!(spi->flags & kSF30))
 					spi->flags |= kSFNeedRedraw;
-				if (!(spi->flags & kSF31))
+				if (!(spi->flags & kSFImageless))
 					spi->flags |= kSFChanged;
 			}
 			if (spi->group_num)
diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h
index f5cb946d76..b8106545d9 100644
--- a/scumm/sprite_he.h
+++ b/scumm/sprite_he.h
@@ -56,7 +56,7 @@ enum SpriteFlags {
 	kSF28           = (1 << 27),
 	kSF29           = (1 << 28),
 	kSF30           = (1 << 29),
-	kSF31           = (1 << 30), // kSFHasImage ?
+	kSFImageless    = (1 << 30),
 	kSF32           = (1 << 31)
 };