[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.394,2.395 script_v100he.cpp,2.89,2.90 script_v90he.cpp,2.184,2.185 sprite_he.cpp,1.100,1.101

[kirben]

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

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

Rename sprite flags/functions


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.394
retrieving revision 2.395
diff -u -d -r2.394 -r2.395
--- intern.h	13 Mar 2005 13:10:38 -0000	2.394
+++ intern.h	13 Mar 2005 13:25:27 -0000	2.395
@@ -962,8 +962,8 @@
 	void spriteInfoSet_zoom(int spriteId, int value);
 	void spriteInfoSet_rotAngle(int spriteId, int value);
 	void spriteInfoSet_flag13(int spriteId, int value);
-	void spriteInfoSet_flag14(int spriteId, int value);
-	void spriteInfoSet_flag15(int spriteId, int value);
+	void spriteInfoGet_flagYFlipped(int spriteId, int value);
+	void spriteInfoGet_flagXFlipped(int spriteId, int value);
 	void spriteInfoSet_flagActive(int spriteId, int value);
 	void spriteInfoSet_flag20(int spriteId, int value);
 	void spriteInfoSet_flagYFlipped(int spriteId, int value);

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.89
retrieving revision 2.90
diff -u -d -r2.89 -r2.90
--- script_v100he.cpp	13 Mar 2005 13:10:38 -0000	2.89
+++ script_v100he.cpp	13 Mar 2005 13:25:27 -0000	2.90
@@ -1926,10 +1926,10 @@
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
 			switch(args[1]) {
 			case 0:
-				spriteInfoSet_flag15(spriteId, args[0]);
+				spriteInfoGet_flagXFlipped(spriteId, args[0]);
 				break;
 			case 1:
-				spriteInfoSet_flag14(spriteId, args[0]);
+				spriteInfoGet_flagYFlipped(spriteId, args[0]);
 				break;
 			case 2:
 				spriteInfoSet_flagActive(spriteId, args[0]);

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.184
retrieving revision 2.185
diff -u -d -r2.184 -r2.185
--- script_v90he.cpp	13 Mar 2005 13:10:38 -0000	2.184
+++ script_v90he.cpp	13 Mar 2005 13:25:27 -0000	2.185
@@ -1057,10 +1057,10 @@
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
 			switch(args[1]) {
 			case 0:
-				spriteInfoSet_flag15(spriteId, args[0]);
+				spriteInfoGet_flagXFlipped(spriteId, args[0]);
 				break;
 			case 1:
-				spriteInfoSet_flag14(spriteId, args[0]);
+				spriteInfoGet_flagYFlipped(spriteId, args[0]);
 				break;
 			case 2:
 				spriteInfoSet_flagActive(spriteId, args[0]);

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- sprite_he.cpp	13 Mar 2005 13:10:38 -0000	1.100
+++ sprite_he.cpp	13 Mar 2005 13:25:28 -0000	1.101
@@ -553,7 +553,7 @@
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
 }
 
-void ScummEngine_v90he::spriteInfoSet_flag14(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoGet_flagYFlipped(int spriteId, int value) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	int oldFlags = _spriteTable[spriteId].flags;
@@ -566,7 +566,7 @@
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
 }
 
-void ScummEngine_v90he::spriteInfoSet_flag15(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoGet_flagXFlipped(int spriteId, int value) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	int oldFlags = _spriteTable[spriteId].flags;