[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.351,2.352 script_v90he.cpp,2.143,2.144 sprite_he.cpp,1.21,1.22

[Eugene Sandulenko]

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

Modified Files:
	intern.h script_v90he.cpp sprite_he.cpp 
Log Message:
Rename classFlags functions and fix one of them.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.351
retrieving revision 2.352
diff -u -d -r2.351 -r2.352
--- intern.h	22 Feb 2005 22:23:09 -0000	2.351
+++ intern.h	22 Feb 2005 22:52:34 -0000	2.352
@@ -935,8 +935,8 @@
 	void spriteInfoSet_flags23_26(int spriteId, int value);
 	void spriteInfoSet_flag31(int spriteId, int value);
 	void spriteInfoSet_field_78_64(int spriteId, int value);
-	void spriteInfoSet_classFlags_1(int spriteId, int value1, int value2);
-	void spriteInfoSet_classFlags_2(int spriteId);
+	void spriteInfoSet_setClassFlags(int spriteId, int value1, int value2);
+	void spriteInfoSet_resetClassFlags(int spriteId);
 
 	void spritesAllocTables(int numSprites, int numGroups, int numMaxSprites);
 	void spritesResetTables(bool refreshScreen);

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.143
retrieving revision 2.144
diff -u -d -r2.143 -r2.144
--- script_v90he.cpp	22 Feb 2005 22:23:09 -0000	2.143
+++ script_v90he.cpp	22 Feb 2005 22:52:35 -0000	2.144
@@ -1218,15 +1218,15 @@
 				int code = *p;
 				if (code == 0) {
 					for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
-						spriteInfoSet_classFlags_2(i);					
+						spriteInfoSet_resetClassFlags(i);					
 					}
 				} else if (code & 0x80) {
 					for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
-						spriteInfoSet_classFlags_1(i, code & 0x7F, 1);
+						spriteInfoSet_setClassFlags(i, code & 0x7F, 1);
 					}
 				} else {
 					for (int i = _curSpriteId; i <= _curMaxSpriteId; ++i) {
-						spriteInfoSet_classFlags_1(i, code & 0x7F, 0);
+						spriteInfoSet_setClassFlags(i, code & 0x7F, 0);
 					}
 				}
 				--p;

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- sprite_he.cpp	22 Feb 2005 22:23:10 -0000	1.21
+++ sprite_he.cpp	22 Feb 2005 22:52:35 -0000	1.22
@@ -485,19 +485,18 @@
 	_spriteTable[spriteId].field_64 = value;
 }
 
-void ScummEngine_v90he::spriteInfoSet_classFlags_1(int spriteId, int classId, int toggle) {
+void ScummEngine_v90he::spriteInfoSet_setClassFlags(int spriteId, int classId, int toggle) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 	checkRange(32, 1, classId, "class %d out of range in statement");
 	
-	// XXX
 	if (toggle) {
 		_spriteTable[spriteId].flags |= 1 << (classId - 1);
 	} else {
-		_spriteTable[spriteId].flags &= 1 << (classId - 1);
+		_spriteTable[spriteId].flags &= ~(1 << (classId - 1));
 	}
 }
 
-void ScummEngine_v90he::spriteInfoSet_classFlags_2(int spriteId) {
+void ScummEngine_v90he::spriteInfoSet_resetClassFlags(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
 	_spriteTable[spriteId].class_flags = 0;