From 685b070107feb018da8006c2005029a779ad31a9 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 24 Feb 2005 23:28:56 +0000
Subject: Rename SpriteGroup fields

svn-id: r16904
---
 scumm/sprite_he.cpp | 22 +++++++++++++++++-----
 scumm/sprite_he.h   |  5 +----
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'scumm')

diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp
index cf7000700d..2a577c06cd 100644
--- a/scumm/sprite_he.cpp
+++ b/scumm/sprite_he.cpp
@@ -870,10 +870,10 @@ void ScummEngine_v90he::spriteGroupSet_fields_0_4_8_C(int spriteGroupId, int val
 	checkRange(_varNumSpriteGroups, 1, spriteGroupId, "Invalid sprite group %d");
 
 	_spriteGroups[spriteGroupId].flags |= kSGF01;
-	_spriteGroups[spriteGroupId].field_0 = value1;
-	_spriteGroups[spriteGroupId].field_4 = value2;
-	_spriteGroups[spriteGroupId].field_8 = value3;
-	_spriteGroups[spriteGroupId].field_C = value4;
+	_spriteGroups[spriteGroupId].bbox.left = value1;
+	_spriteGroups[spriteGroupId].bbox.top = value2;
+	_spriteGroups[spriteGroupId].bbox.right = value3;
+	_spriteGroups[spriteGroupId].bbox.bottom = value4;
 
 	redrawSpriteGroup(spriteGroupId);
 }
@@ -1269,7 +1269,19 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) {
 		spi->imgFlags = wiz.img.flags;
 		
 		if (spi->group_num && _spriteGroups[spi->group_num].flags & kSGF01) {
-			// TODO: rectClipIfIntersects() is missing
+			/* TODO: rectClipIfIntersects() is missing
+			if (r1.intersects(r2)) {
+				r1.clip(r2);
+				wiz.processFlags |= 0x200;
+				wiz.box = spi->bbox;
+			} else {
+				bboxPtr->left = 1234;
+				bboxPtr->top = 1234;
+				bboxPtr->right = -1234;
+				bboxPtr->bottom = -1234;
+				continue;
+			}
+			*/
 		}
 		if (spi->field_14) {
 			wiz.processFlags |= 0x8000;
diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h
index 14b26ab371..ed55a09503 100644
--- a/scumm/sprite_he.h
+++ b/scumm/sprite_he.h
@@ -103,10 +103,7 @@ struct SpriteInfo {
 };
 
 struct SpriteGroup {
-	int field_0;
-	int field_4;
-	int field_8;
-	int field_C;
+	Common::Rect bbox;
 	int field_10;
 	int flags;
 	int tx;
-- 
cgit v1.2.3