[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.75,1.76

[kirben]

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

Modified Files:
	sprite_he.cpp 
Log Message:

Revert the spriteGroupId checks.change.


Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- sprite_he.cpp	27 Feb 2005 06:01:11 -0000	1.75
+++ sprite_he.cpp	27 Feb 2005 06:07:09 -0000	1.76
@@ -341,7 +341,7 @@
 int ScummEngine_v90he::spriteGroupGet_allocateGroupSpritesList(int spriteGroupId) {
 	int i, j = 0, sprites = 0;
 
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	for (i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId)
@@ -364,43 +364,43 @@
 }
 
 int ScummEngine_v90he::spriteGroupGet_zorderPriority(int spriteGroupId) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	return _spriteGroups[spriteGroupId].zorderPriority;
 }
 
 int ScummEngine_v90he::spriteGroupGet_field_20(int spriteGroupId) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	return _spriteGroups[spriteGroupId].field_20;
 }
 
 int ScummEngine_v90he::spriteGroupGet_scale_x_ratio_mul(int spriteGroupId) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	return _spriteGroups[spriteGroupId].scale_x_ratio_mul;
 }
 
 int ScummEngine_v90he::spriteGroupGet_scale_x_ratio_div(int spriteGroupId) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	return _spriteGroups[spriteGroupId].scale_x_ratio_div;
 }
 
 int ScummEngine_v90he::spriteGroupGet_scale_y_ratio_mul(int spriteGroupId) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	return _spriteGroups[spriteGroupId].scale_y_ratio_mul;
 }
 
 int ScummEngine_v90he::spriteGroupGet_scale_y_ratio_div(int spriteGroupId) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	return _spriteGroups[spriteGroupId].scale_y_ratio_div;
 }
 
 void ScummEngine_v90he::spriteGroupGet_tx_ty(int spriteGroupId, int32 &tx, int32 &ty) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	tx = _spriteGroups[spriteGroupId].tx;
 	ty = _spriteGroups[spriteGroupId].ty;
@@ -764,7 +764,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case0_0(int spriteGroupId, int value1, int value2) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId) {
@@ -778,7 +778,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case0_1(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId)
@@ -787,7 +787,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case0_2(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId) {
@@ -798,7 +798,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case0_3(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId) {
@@ -811,7 +811,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case0_4(int spriteGroupId) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId)
@@ -820,7 +820,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case0_5(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId) {
@@ -831,7 +831,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case0_6(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId) {
@@ -844,7 +844,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case0_7(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	for (int i = 1; i < _varNumSprites; i++) {
 		if (_spriteTable[i].group_num == spriteGroupId) {
@@ -856,7 +856,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case5_0(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	if (_spriteGroups[spriteGroupId].scale_x_ratio_mul == value)
 		return;
@@ -873,7 +873,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case5_1(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	if (_spriteGroups[spriteGroupId].scale_x_ratio_div == value)
 		return;
@@ -890,7 +890,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case5_2(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	if (_spriteGroups[spriteGroupId].scale_y_ratio_mul == value)
 		return;
@@ -907,7 +907,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case5_3(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	if (_spriteGroups[spriteGroupId].scale_y_ratio_div == value)
 		return;
@@ -924,7 +924,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_zorderPriority(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	if (_spriteGroups[spriteGroupId].zorderPriority == value)
 		return;
@@ -935,7 +935,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_tx_ty(int spriteGroupId, int value1, int value2) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	_spriteGroups[spriteGroupId].tx += value1;
 	_spriteGroups[spriteGroupId].ty += value2;
@@ -944,7 +944,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case26(int spriteGroupId, int value) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	if (_spriteGroups[spriteGroupId].field_20 == value)
 		return;
@@ -955,7 +955,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case28(int spriteGroupId, int value1, int value2) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	if (_spriteGroups[spriteGroupId].tx == value1 && _spriteGroups[spriteGroupId].ty == value2)
 		return;
@@ -967,7 +967,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_bbox(int spriteGroupId, int x1, int y1, int x2, int y2) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	_spriteGroups[spriteGroupId].flags |= kSGFClipBox;
 	_spriteGroups[spriteGroupId].bbox.left = x1;
@@ -979,7 +979,7 @@
 }
 
 void ScummEngine_v90he::spriteGroupSet_case56(int spriteGroupId) {
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	_spriteGroups[spriteGroupId].flags &= ~(kSGFNeedRedraw);
 
@@ -1000,7 +1000,7 @@
 
 void ScummEngine_v90he::spritesResetGroup(int spriteGroupId) {
 	SpriteGroup *spg = &_spriteGroups[spriteGroupId];
-	checkRange(_varNumSpriteGroups, 64, spriteGroupId, "Invalid sprite group %d");
+	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	spg->zorderPriority = 0;
 	spg->tx = spg->ty = 0;