[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.353,2.354 script_v100he.cpp,2.55,2.56 script_v90he.cpp,2.145,2.146 sprite_he.cpp,1.23,1.24

Eugene Sandulenko sev at users.sourceforge.net
Tue Feb 22 18:37:15 CET 2005


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

Modified Files:
	intern.h script_v100he.cpp script_v90he.cpp sprite_he.cpp 
Log Message:
spriteInfoSet_case183 -> spriteInfoSet_resetSprite and its implementation.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.353
retrieving revision 2.354
diff -u -d -r2.353 -r2.354
--- intern.h	23 Feb 2005 01:08:29 -0000	2.353
+++ intern.h	23 Feb 2005 02:35:59 -0000	2.354
@@ -916,7 +916,7 @@
 	void spriteInfoSet_field_14(int spriteId, int value);
 	void spriteInfoSet_field_7C(int spriteId, int value);
 	void spriteInfoSet_field_80(int spriteId, int value);
-	void spriteInfoSet_case183(int spriteId);
+	void spriteInfoSet_resetSprite(int spriteId);
 	void spriteInfoSet_resState(int spriteId, int value);
 	void spriteInfoSet_tx_ty(int spriteId, int value1, int value2);
 	void spriteInfoSet_groupNum(int spriteId, int value);

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.55
retrieving revision 2.56
diff -u -d -r2.55 -r2.56
--- script_v100he.cpp	23 Feb 2005 01:08:29 -0000	2.55
+++ script_v100he.cpp	23 Feb 2005 02:35:59 -0000	2.56
@@ -1723,7 +1723,7 @@
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			spriteInfoSet_case183(spriteId);
+			spriteInfoSet_resetSprite(spriteId);
 		break;
 	case 54:
 		pop();

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.145
retrieving revision 2.146
diff -u -d -r2.145 -r2.146
--- script_v90he.cpp	23 Feb 2005 01:08:29 -0000	2.145
+++ script_v90he.cpp	23 Feb 2005 02:35:59 -0000	2.146
@@ -1271,7 +1271,7 @@
 			spriteId++;
 
 		for (; spriteId <= _curMaxSpriteId; spriteId++)
-			spriteInfoSet_case183(spriteId);
+			spriteInfoSet_resetSprite(spriteId);
 		break;
 	default:
 		error("o90_setSpriteInfo: Unknown case %d", subOp);

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sprite_he.cpp	23 Feb 2005 01:08:29 -0000	1.23
+++ sprite_he.cpp	23 Feb 2005 02:35:59 -0000	1.24
@@ -502,10 +502,30 @@
 	_spriteTable[spriteId].class_flags = 0;
 }
 
-void ScummEngine_v90he::spriteInfoSet_case183(int spriteId) {
+void ScummEngine_v90he::spriteInfoSet_resetSprite(int spriteId) {
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
 
-	// TODO
+	_spriteTable[spriteId].rot_angle = 0;
+	_spriteTable[spriteId].zoom = 0;
+
+	spriteInfoSet_addImageToList(spriteId, 1, &spriteId);
+
+	_spriteTable[spriteId].field_54 = 0;
+	_spriteTable[spriteId].tx = 0;
+	_spriteTable[spriteId].ty = 0;
+
+	_spriteTable[spriteId].flags &= ~(kSF07 | kSFRotated);
+	_spriteTable[spriteId].flags |= kSF01 | kSFNeedRedraw;
+	_spriteTable[spriteId].dx = 0;
+	_spriteTable[spriteId].dy = 0;
+	_spriteTable[spriteId].field_44 = 0;
+	_spriteTable[spriteId].group_num = 0;
+	_spriteTable[spriteId].field_78 = 0;
+	_spriteTable[spriteId].field_64 = 0;
+	_spriteTable[spriteId].class_flags = 0;
+	_spriteTable[spriteId].field_14 = 0;
+	_spriteTable[spriteId].field_7C = 0;
+	_spriteTable[spriteId].field_80 = 0;
 }
 
 void ScummEngine_v90he::spriteInfoSet_addImageToList(int spriteId, int imageNum, int *spriteIdptr) {





More information about the Scummvm-git-logs mailing list