[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.396,2.397 script_v100he.cpp,2.91,2.92 script_v90he.cpp,2.186,2.187 sprite_he.cpp,1.102,1.103 sprite_he.h,1.24,1.25

kirben kirben at users.sourceforge.net
Thu Mar 17 01:30:46 CET 2005


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

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

Another correction to sprite flags


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.396
retrieving revision 2.397
diff -u -d -r2.396 -r2.397
--- intern.h	14 Mar 2005 12:54:23 -0000	2.396
+++ intern.h	17 Mar 2005 09:28:25 -0000	2.397
@@ -994,7 +994,7 @@
 	void spriteGroupSet_scale_x_ratio_div(int spriteGroupId, int value);
 	void spriteGroupSet_scale_y_ratio_mul(int spriteGroupId, int value);
 	void spriteGroupSet_scale_y_ratio_div(int spriteGroupId, int value);
-	void spriteGroupSet_flagNeedRedrawAnd(int spriteGroupId);
+	void spriteGroupSet_flagClipBoxAnd(int spriteGroupId);
 
 	void spritesAllocTables(int numSprites, int numGroups, int numMaxSprites);
 	void spritesResetGroup(int spriteGroupId);

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.91
retrieving revision 2.92
diff -u -d -r2.91 -r2.92
--- script_v100he.cpp	14 Mar 2005 12:54:23 -0000	2.91
+++ script_v100he.cpp	17 Mar 2005 09:28:36 -0000	2.92
@@ -1069,7 +1069,7 @@
 		if (!_curSpriteGroupId)
 			break;
 
-		spriteGroupSet_flagNeedRedrawAnd(_curSpriteGroupId);
+		spriteGroupSet_flagClipBoxAnd(_curSpriteGroupId);
 		break;
 	default:
 		error("o100_setSpriteGroupInfo: Unknown case %d", subOp);

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.186
retrieving revision 2.187
diff -u -d -r2.186 -r2.187
--- script_v90he.cpp	14 Mar 2005 12:54:23 -0000	2.186
+++ script_v90he.cpp	17 Mar 2005 09:28:36 -0000	2.187
@@ -1554,7 +1554,7 @@
 		if (!_curSpriteGroupId)
 			break;
 
-		spriteGroupSet_flagNeedRedrawAnd(_curSpriteGroupId);
+		spriteGroupSet_flagClipBoxAnd(_curSpriteGroupId);
 		break;
 	case 180:
 		if (!_curSpriteGroupId)

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- sprite_he.cpp	14 Mar 2005 12:54:23 -0000	1.102
+++ sprite_he.cpp	17 Mar 2005 09:28:36 -0000	1.103
@@ -547,7 +547,7 @@
 	if (value)
 		_spriteTable[spriteId].flags |= kSF13;
 	else
-		_spriteTable[spriteId].flags &= ~(kSF09 | kSF13);
+		_spriteTable[spriteId].flags &= ~kSF13;
 
 	if (_spriteTable[spriteId].res_id && _spriteTable[spriteId].flags != oldFlags)
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -560,7 +560,7 @@
 	if (value)
 		_spriteTable[spriteId].flags |= kSFYFlipped;
 	else
-		_spriteTable[spriteId].flags &= ~(kSF09 | kSFYFlipped);
+		_spriteTable[spriteId].flags &= ~kSFYFlipped;
 
 	if (_spriteTable[spriteId].res_id && _spriteTable[spriteId].flags != oldFlags)
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -573,7 +573,7 @@
 	if (value)
 		_spriteTable[spriteId].flags |= kSFXFlipped;
 	else
-		_spriteTable[spriteId].flags &= ~(kSF09 | kSFXFlipped);
+		_spriteTable[spriteId].flags &= ~kSFXFlipped;
 
 	if (_spriteTable[spriteId].res_id && _spriteTable[spriteId].flags != oldFlags)
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -585,7 +585,7 @@
 	if (value)
 		_spriteTable[spriteId].flags |= kSFActive;
 	else
-		_spriteTable[spriteId].flags &= ~(kSF09 | kSFActive);
+		_spriteTable[spriteId].flags &= ~kSFActive;
 }
 
 void ScummEngine_v90he::spriteInfoSet_flag20(int spriteId, int value) {
@@ -595,7 +595,7 @@
 	if (value)
 		_spriteTable[spriteId].flags |= kSF20;
 	else
-		_spriteTable[spriteId].flags &= ~(kSFChanged | kSF20);
+		_spriteTable[spriteId].flags &= ~kSF20;
 
 	if (_spriteTable[spriteId].res_id && _spriteTable[spriteId].flags != oldFlags)
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
@@ -607,7 +607,7 @@
 	if (value)
 		_spriteTable[spriteId].flags |= kSF22;
 	else
-		_spriteTable[spriteId].flags &= ~(kSFChanged | kSF22);
+		_spriteTable[spriteId].flags &= ~kSF22;
 }
 
 void ScummEngine_v90he::spriteInfoSet_flagXFlipped(int spriteId, int value) {
@@ -616,7 +616,7 @@
 	if (value)
 		_spriteTable[spriteId].flags |= kSF23 | kSFBlitDirectly;
 	else
-		_spriteTable[spriteId].flags &= ~(kSFChanged | kSF23 | kSFBlitDirectly);
+		_spriteTable[spriteId].flags &= ~(kSF23 | kSFBlitDirectly);
 }
 
 void ScummEngine_v90he::spriteInfoSet_flagHasImage(int spriteId, int value) {
@@ -626,7 +626,7 @@
 	if (!value)
 		_spriteTable[spriteId].flags |= kSFImageless;
 	else
-		_spriteTable[spriteId].flags &= ~(kSFChanged | kSFImageless);
+		_spriteTable[spriteId].flags &= ~kSFImageless;
 }
 
 void ScummEngine_v90he::spriteInfoSet_delay(int spriteId, int value) {
@@ -681,7 +681,7 @@
 	_spriteTable[spriteId].tx = 0;
 	_spriteTable[spriteId].ty = 0;
 
-	_spriteTable[spriteId].flags &= ~(kSF09 | kSFYFlipped | kSFXFlipped);
+	_spriteTable[spriteId].flags &= ~(kSFYFlipped | kSFXFlipped);
 	_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;
 	_spriteTable[spriteId].dx = 0;
 	_spriteTable[spriteId].dy = 0;
@@ -780,7 +780,7 @@
 			if (value)
 				_spriteTable[i].flags |= kSF23 | kSFBlitDirectly;
 			else
-				_spriteTable[i].flags &= ~(kSFChanged | kSF23 | kSFBlitDirectly);
+				_spriteTable[i].flags &= ~(kSF23 | kSFBlitDirectly);
 		}
 	}
 }
@@ -813,7 +813,7 @@
 			if (value)
 				_spriteTable[i].flags |= kSF22;
 			else
-				_spriteTable[i].flags &= ~(kSFChanged | kSF22);
+				_spriteTable[i].flags &= ~kSF22;
 		}
 	}
 }
@@ -942,10 +942,10 @@
 	}
 }
 
-void ScummEngine_v90he::spriteGroupSet_flagNeedRedrawAnd(int spriteGroupId) {
+void ScummEngine_v90he::spriteGroupSet_flagClipBoxAnd(int spriteGroupId) {
 	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
-	_spriteGroups[spriteGroupId].flags &= ~(kSGFNeedRedraw);
+	_spriteGroups[spriteGroupId].flags &= ~(kSGFClipBox);
 	redrawSpriteGroup(spriteGroupId);
 }
 
@@ -966,7 +966,7 @@
 	spg->zorderPriority = 0;
 	spg->tx = spg->ty = 0;
 
-	spg->flags &= ~kSGFNeedRedraw;
+	spg->flags &= ~kSGFClipBox;
 	redrawSpriteGroup(spriteGroupId);
 
 	spg->field_20 = 0;
@@ -1166,7 +1166,7 @@
 				continue;
 		}
 		
-		spi->flags &= ~(kSFChanged | kSFNeedRedraw);
+		spi->flags &= ~kSFNeedRedraw;
 		res_id = spi->res_id;
 		res_state = spi->res_state;
 		loadImgSpot(spi->res_id, spi->res_state, spr_wiz_x, spr_wiz_y);
@@ -1239,7 +1239,7 @@
 		if (spr_flags & kSFYFlipped)
 			wiz.img.flags |= kWIFFlipY;
 		if (spr_flags & kSF13) {
-			wiz.img.flags &= ~(0x11);
+			wiz.img.flags &= ~(0x10);
 			wiz.img.flags |= kWIFBlitToFrontVideoBuffer;
 		}
 		if (spi->field_54) {

Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- sprite_he.h	14 Mar 2005 12:54:24 -0000	1.24
+++ sprite_he.h	17 Mar 2005 09:28:36 -0000	1.25
@@ -61,8 +61,7 @@
 };
 
 enum SpriteGroupFlags {
-	kSGFClipBox     = 1 << 0,
-	kSGFNeedRedraw  = 1 << 1
+	kSGFClipBox     = (1 << 0)
 };
 
 struct SpriteInfo {





More information about the Scummvm-git-logs mailing list