Rename sprite flags/functions

svn-id: r17116

5 files changed, 19 insertions, 19 deletions

diff --git a/scumm/intern.h b/scumm/intern.h
index e2fd6654f5..550a6eaa02 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -912,8 +912,8 @@ protected:
 	int spriteInfoGet_classFlags(int spriteId, int num);
 	int spriteInfoGet_classFlagsAnd(int spriteId, int num, int *args);
 	int spriteInfoGet_flags_13(int spriteId);
-	int spriteInfoGet_flags_14(int spriteId);
-	int spriteInfoGet_flags_15(int spriteId);
+	int spriteInfoGet_flagYFlipped(int spriteId);
+	int spriteInfoGet_flagXFlipped(int spriteId);
 	int spriteInfoGet_flagActive(int spriteId);
 	int spriteInfoGet_flags_20(int spriteId);
 	int spriteInfoGet_flags_22(int spriteId);
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp
index 7a06acd928..3cd879a1b9 100644
--- a/scumm/script_v100he.cpp
+++ b/scumm/script_v100he.cpp
@@ -2637,10 +2637,10 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
 		if (spriteId) {
 			switch(flags) {
 			case 0:
-				push(spriteInfoGet_flags_15(spriteId));
+				push(spriteInfoGet_flagXFlipped(spriteId));
 				break;
 			case 1:
-				push(spriteInfoGet_flags_14(spriteId));
+				push(spriteInfoGet_flagYFlipped(spriteId));
 				break;
 			case 2:
 				push(spriteInfoGet_flagActive(spriteId));
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 6cb5e2743f..16b48d66e4 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -835,10 +835,10 @@ void ScummEngine_v90he::o90_getSpriteInfo() {
 		if (spriteId) {
 			switch(flags) {
 			case 0:
-				push(spriteInfoGet_flags_15(spriteId));
+				push(spriteInfoGet_flagXFlipped(spriteId));
 				break;
 			case 1:
-				push(spriteInfoGet_flags_14(spriteId));
+				push(spriteInfoGet_flagYFlipped(spriteId));
 				break;
 			case 2:
 				push(spriteInfoGet_flagActive(spriteId));
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index c79f3bf25c..bf9bc750c1 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -180,16 +180,16 @@ int ScummEngine_v90he::spriteInfoGet_flags_13(int spriteId) {
 	return ((_spriteTable[spriteId].flags & kSF13) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_14(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagYFlipped(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	return ((_spriteTable[spriteId].flags & kSF14) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSFYFlipped) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_15(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagXFlipped(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	return ((_spriteTable[spriteId].flags & kSF15) != 0) ? 1 : 0;
+	return ((_spriteTable[spriteId].flags & kSFXFlipped) != 0) ? 1 : 0;
 }
 
 int ScummEngine_v90he::spriteInfoGet_flagActive(int spriteId) {
@@ -558,9 +558,9 @@ void ScummEngine_v90he::spriteInfoSet_flag14(int spriteId, int value) {
 
 	int oldFlags = _spriteTable[spriteId].flags;
 	if (value)
-		_spriteTable[spriteId].flags |= kSF14;
+		_spriteTable[spriteId].flags |= kSFYFlipped;
 	else
-		_spriteTable[spriteId].flags &= ~(kSF09 | kSF14);
+		_spriteTable[spriteId].flags &= ~(kSF09 | kSFYFlipped);
 
 	if (_spriteTable[spriteId].res_id && _spriteTable[spriteId].flags != oldFlags)
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -571,9 +571,9 @@ void ScummEngine_v90he::spriteInfoSet_flag15(int spriteId, int value) {
 
 	int oldFlags = _spriteTable[spriteId].flags;
 	if (value)
-		_spriteTable[spriteId].flags |= kSF15;
+		_spriteTable[spriteId].flags |= kSFXFlipped;
 	else
-		_spriteTable[spriteId].flags &= ~(kSF09 | kSF15);
+		_spriteTable[spriteId].flags &= ~(kSF09 | kSFXFlipped);
 
 	if (_spriteTable[spriteId].res_id && _spriteTable[spriteId].flags != oldFlags)
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -681,7 +681,7 @@ void ScummEngine_v90he::spriteInfoSet_resetSprite(int spriteId) {
 	_spriteTable[spriteId].tx = 0;
 	_spriteTable[spriteId].ty = 0;
 
-	_spriteTable[spriteId].flags &= ~(kSF09 | kSF14 | kSF15);
+	_spriteTable[spriteId].flags &= ~(kSF09 | kSFYFlipped | kSFXFlipped);
 	_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
 	_spriteTable[spriteId].dx = 0;
 	_spriteTable[spriteId].dy = 0;
@@ -1235,9 +1235,9 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
 		}
 
 		wiz.img.flags = 0x10;
-		if (spr_flags & kSF15)
+		if (spr_flags & kSFXFlipped)
 			wiz.img.flags |= kWIFFlipX;
-		if (spr_flags & kSF14)
+		if (spr_flags & kSFYFlipped)
 			wiz.img.flags |= kWIFFlipY;
 		if (spr_flags & kSF13) {
 			wiz.img.flags &= ~(0x11);
diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h
index 254d764cf3..cd18060d8e 100644
--- a/scumm/sprite_he.h
+++ b/scumm/sprite_he.h
@@ -39,8 +39,8 @@ enum SpriteFlags {
 	kSF11           = (1 << 10),
 	kSF12           = (1 << 11),
 	kSF13           = (1 << 12),
-	kSF14           = (1 << 13),
-	kSF15           = (1 << 14),
+	kSFYFlipped     = (1 << 13),
+	kSFXFlipped     = (1 << 14),
 	kSFActive       = (1 << 15),
 	kSF17           = (1 << 16),
 	kSF18           = (1 << 17),