[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.404,2.405 script_v100he.cpp,2.101,2.102 script_v90he.cpp,2.197,2.198 sprite_he.cpp,1.109,1.110

kirben kirben at users.sourceforge.net
Tue Mar 29 06:11:47 CEST 2005


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

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

Rename sprite functions


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.404
retrieving revision 2.405
diff -u -d -r2.404 -r2.405
--- intern.h	28 Mar 2005 11:38:04 -0000	2.404
+++ intern.h	29 Mar 2005 14:11:08 -0000	2.405
@@ -913,11 +913,11 @@
 
 	int findSpriteWithClassOf(int x, int y, int spriteGroupId, int d, int num, int *args);
 	int spriteInfoGet_classFlags(int spriteId, int num, int *args);
-	int spriteInfoGet_flags_13(int spriteId);
+	int spriteInfoGet_flagDoubleBuffered(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_flagNeedPaletteRemap(int spriteId);
 	int spriteInfoGet_flags_22(int spriteId);
 	int spriteInfoGet_flags_23(int spriteId);	
 	int spriteInfoGet_flagHasImage(int spriteId);
@@ -963,11 +963,11 @@
 	void spriteInfoSet_Inc_tx_ty(int spriteId, int value1, int value2);
 	void spriteInfoSet_zoom(int spriteId, int value);
 	void spriteInfoSet_rotAngle(int spriteId, int value);
-	void spriteInfoSet_flag13(int spriteId, int value);
+	void spriteInfoSet_flagDoubleBuffered(int spriteId, int value);
 	void spriteInfoSet_flagYFlipped(int spriteId, int value);
 	void spriteInfoSet_flagXFlipped(int spriteId, int value);
 	void spriteInfoSet_flagActive(int spriteId, int value);
-	void spriteInfoSet_flag20(int spriteId, int value);
+	void spriteInfoSet_flagNeedPaletteRemap(int spriteId, int value);
 	void spriteInfoSet_flag22(int spriteId, int value);
 	void spriteInfoSet_flag23(int spriteId, int value);
 	void spriteInfoSet_flagHasImage(int spriteId, int value);

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.101
retrieving revision 2.102
diff -u -d -r2.101 -r2.102
--- script_v100he.cpp	28 Mar 2005 11:38:04 -0000	2.101
+++ script_v100he.cpp	29 Mar 2005 14:11:08 -0000	2.102
@@ -1935,10 +1935,10 @@
 				spriteInfoSet_flagActive(spriteId, args[0]);
 				break;
 			case 3:
-				spriteInfoSet_flag13(spriteId, args[0]);
+				spriteInfoSet_flagDoubleBuffered(spriteId, args[0]);
 				break;
 			case 4:
-				spriteInfoSet_flag20(spriteId, args[0]);
+				spriteInfoSet_flagNeedPaletteRemap(spriteId, args[0]);
 				break;
 			default:
 				break;
@@ -2643,10 +2643,10 @@
 				push(spriteInfoGet_flagActive(spriteId));
 				break;
 			case 3:
-				push(spriteInfoGet_flags_13(spriteId));
+				push(spriteInfoGet_flagDoubleBuffered(spriteId));
 				break;
 			case 4:
-				push(spriteInfoGet_flags_20(spriteId));
+				push(spriteInfoGet_flagNeedPaletteRemap(spriteId));
 				break;
 			default:
 				push(0);

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.197
retrieving revision 2.198
diff -u -d -r2.197 -r2.198
--- script_v90he.cpp	29 Mar 2005 13:49:17 -0000	2.197
+++ script_v90he.cpp	29 Mar 2005 14:11:08 -0000	2.198
@@ -844,10 +844,10 @@
 				push(spriteInfoGet_flagActive(spriteId));
 				break;
 			case 3:
-				push(spriteInfoGet_flags_13(spriteId));
+				push(spriteInfoGet_flagDoubleBuffered(spriteId));
 				break;
 			case 4:
-				push(spriteInfoGet_flags_20(spriteId));
+				push(spriteInfoGet_flagNeedPaletteRemap(spriteId));
 				break;
 			default:
 				push(0);
@@ -1060,10 +1060,10 @@
 				spriteInfoSet_flagActive(spriteId, args[0]);
 				break;
 			case 3:
-				spriteInfoSet_flag13(spriteId, args[0]);
+				spriteInfoSet_flagDoubleBuffered(spriteId, args[0]);
 				break;
 			case 4:
-				spriteInfoSet_flag20(spriteId, args[0]);
+				spriteInfoSet_flagNeedPaletteRemap(spriteId, args[0]);
 				break;
 			default:
 				break;
@@ -2241,7 +2241,7 @@
 	case 714:
 		break;
 	case 1492:
-		spriteInfoSet_flag13(args[1], args[2]);
+		spriteInfoSet_flagDoubleBuffered(args[1], args[2]);
 		break;
 	case 2001:
 		// Used in SoccerMLS/Soccer2004

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- sprite_he.cpp	29 Mar 2005 09:32:43 -0000	1.109
+++ sprite_he.cpp	29 Mar 2005 14:11:08 -0000	1.110
@@ -167,7 +167,7 @@
 	return 1;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_13(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagDoubleBuffered(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	return ((_spriteTable[spriteId].flags & kSFDoubleBuffered) != 0) ? 1 : 0;
@@ -191,7 +191,7 @@
 	return ((_spriteTable[spriteId].flags & kSFActive) != 0) ? 1 : 0;
 }
 
-int ScummEngine_v90he::spriteInfoGet_flags_20(int spriteId) {
+int ScummEngine_v90he::spriteInfoGet_flagNeedPaletteRemap(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	return ((_spriteTable[spriteId].flags & kSFNeedPaletteRemap) != 0) ? 1 : 0;
@@ -533,7 +533,7 @@
 	}
 }
 
-void ScummEngine_v90he::spriteInfoSet_flag13(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagDoubleBuffered(int spriteId, int value) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	int oldFlags = _spriteTable[spriteId].flags;
@@ -581,7 +581,7 @@
 		_spriteTable[spriteId].flags &= ~kSFActive;
 }
 
-void ScummEngine_v90he::spriteInfoSet_flag20(int spriteId, int value) {
+void ScummEngine_v90he::spriteInfoSet_flagNeedPaletteRemap(int spriteId, int value) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	int oldFlags = _spriteTable[spriteId].flags;





More information about the Scummvm-git-logs mailing list