libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-13 13:10:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename SpriteGroup fields

Browse Source 
svn-id: r16904
This commit is contained in:
Travis Howell 2005-02-24 23:28:56 +00:00
parent 451527e2af
commit 685b070107
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scumm/sprite_he.cpp
View File

@ -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;

5
scumm/sprite_he.h
View File

@ -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;