[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.50,1.51 sprite_he.h,1.14,1.15
kirben
kirben at users.sourceforge.net
Thu Feb 24 15:30:39 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.365,2.366 script_v100he.cpp,2.62,2.63 script_v90he.cpp,2.157,2.158 sprite_he.cpp,1.49,1.50 sprite_he.h,1.13,1.14
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.51,1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31331/scumm
Modified Files:
sprite_he.cpp sprite_he.h
Log Message:
Rename SpriteGroup fields
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- sprite_he.cpp 24 Feb 2005 23:11:49 -0000 1.50
+++ sprite_he.cpp 24 Feb 2005 23:28:56 -0000 1.51
@@ -870,10 +870,10 @@
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 @@
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;
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sprite_he.h 24 Feb 2005 23:11:50 -0000 1.14
+++ sprite_he.h 24 Feb 2005 23:28:56 -0000 1.15
@@ -103,10 +103,7 @@
};
struct SpriteGroup {
- int field_0;
- int field_4;
- int field_8;
- int field_C;
+ Common::Rect bbox;
int field_10;
int flags;
int tx;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.365,2.366 script_v100he.cpp,2.62,2.63 script_v90he.cpp,2.157,2.158 sprite_he.cpp,1.49,1.50 sprite_he.h,1.13,1.14
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.51,1.52
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list