[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.375,2.376 sprite_he.cpp,1.72,1.73 sprite_he.h,1.18,1.19
Gregory Montoir
cyx at users.sourceforge.net
Sat Feb 26 19:39:00 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7599/scumm
Modified Files:
intern.h sprite_he.cpp sprite_he.h
Log Message:
moved some variables to ScummEngine_v90he and renamed some SpriteInfo fields
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.375
retrieving revision 2.376
diff -u -d -r2.375 -r2.376
--- intern.h 27 Feb 2005 02:55:13 -0000 2.375
+++ intern.h 27 Feb 2005 03:36:32 -0000 2.376
@@ -838,6 +838,9 @@
void o80_pickVarRandom();
};
+struct SpriteInfo;
+struct SpriteGroup;
+
class ScummEngine_v90he : public ScummEngine_v80he {
protected:
typedef void (ScummEngine_v90he::*OpcodeProcV90he)();
@@ -864,6 +867,16 @@
int _curMaxSpriteId;
int _curSpriteId;
int _curSpriteGroupId;
+ int _varNumSpriteGroups;
+ int _numSpritesToProcess;
+ int _varNumSprites;
+ int _varMaxSprites;
+ SpriteInfo *_spriteTable;
+ SpriteGroup *_spriteGroups;
+ SpriteInfo **_activeSpritesTable;
+ uint16 *_imageListTable;
+ uint16 *_imageListStack;
+ int _curSprImageListNum;
public:
ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) : ScummEngine_v80he(detector, syst, gs, md5sum) {}
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- sprite_he.cpp 26 Feb 2005 12:48:51 -0000 1.72
+++ sprite_he.cpp 27 Feb 2005 03:36:33 -0000 1.73
@@ -80,10 +80,10 @@
int16 x1, x2, y1, y2;
state = getWizImageStates(spi->field_80);
- state /= spi->field_48;
+ state /= spi->cur_img_state;
- x -= spi->field_34;
- y -= spi->field_38;
+ x -= spi->pos.x;
+ y -= spi->pos.y;
loadImgSpot(spi->field_4C, state, x1, y1);
loadImgSpot(spi->field_80, state, x2, y2);
@@ -104,9 +104,9 @@
if (spi->bbox.bottom < y)
continue;
- x -= spi->field_34;
- y -= spi->field_38;
- state = spi->field_48;
+ x -= spi->pos.x;
+ y -= spi->pos.y;
+ state = spi->cur_img_state;
}
rot_angle = spi->field_68;
@@ -742,7 +742,7 @@
_spriteTable[spriteId].flags &= ~(kSFImageless);
_spriteTable[spriteId].flags |= kSFChanged | kSFBlitDirectly;
_spriteTable[spriteId].field_4C = 0;
- _spriteTable[spriteId].field_48 = 0;
+ _spriteTable[spriteId].cur_img_state = 0;
_spriteTable[spriteId].res_wiz_states = 0;
}
}
@@ -1287,13 +1287,13 @@
wiz.img.y1 = spi->ty - spr_wiz_y;
}
- spi->field_48 = wiz.img.state = res_state;
+ spi->cur_img_state = wiz.img.state = res_state;
spi->field_4C = wiz.img.resNum = res_id;
wiz.processFlags = kWPFNewState | kWPFSetPos;
spi->field_68 = spi->rot_angle;
spi->field_6C = spi->zoom;
- spi->field_34 = wiz.img.x1;
- spi->field_38 = wiz.img.y1;
+ spi->pos.x = wiz.img.x1;
+ spi->pos.y = wiz.img.y1;
bboxPtr = &spi->bbox;
if (res_id) {
rot_angle = spi->rot_angle;
@@ -1369,7 +1369,7 @@
if (spi->group_num && (_spriteGroups[spi->group_num].flags & kSGFClipBox)) {
if (spi->bbox.intersects(_spriteGroups[spi->group_num].bbox)) {
spi->bbox.clip(_spriteGroups[spi->group_num].bbox);
- wiz.processFlags |= 0x200;
+ wiz.processFlags |= kWPFClipBox;
wiz.box = spi->bbox;
} else {
bboxPtr->left = 1234;
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sprite_he.h 26 Feb 2005 11:22:00 -0000 1.18
+++ sprite_he.h 27 Feb 2005 03:36:33 -0000 1.19
@@ -76,12 +76,11 @@
Common::Rect bbox;
int dx;
int dy;
- int field_34;
- int field_38;
+ Common::Point pos;
int tx;
int ty;
int field_44;
- int field_48;
+ int cur_img_state;
int field_4C;
int imglist_num;
int field_54;
@@ -118,18 +117,6 @@
int scale_y_ratio_div;
};
- int _varNumSpriteGroups;
- int _numSpritesToProcess;
- int _varNumSprites;
- int _varMaxSprites;
- SpriteInfo *_spriteTable;
- SpriteGroup *_spriteGroups;
- SpriteInfo **_activeSpritesTable;
- uint16 *_imageListTable;
- uint16 *_imageListStack;
- int _curSprImageListNum;
-
-
} // End of namespace Scumm
#endif
More information about the Scummvm-git-logs
mailing list