[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.87,1.88 sprite_he.h,1.19,1.20
kirben
kirben at users.sourceforge.net
Sat Mar 5 20:31:34 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6195/scumm
Modified Files:
sprite_he.cpp sprite_he.h
Log Message:
Rename sprite fields
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- sprite_he.cpp 6 Mar 2005 04:26:24 -0000 1.87
+++ sprite_he.cpp 6 Mar 2005 04:31:02 -0000 1.88
@@ -44,7 +44,7 @@
for (int i = 0; i < _numSpritesToProcess; ++i) {
SpriteInfo *spi = _activeSpritesTable[i];
- if (!spi->field_4C)
+ if (!spi->cur_res_id)
continue;
if (spriteGroupId && spi->group_num != spriteGroupId)
@@ -81,7 +81,7 @@
int resId, state, rot_angle, zoom;
int32 w, h;
- resId = spi->field_4C;
+ resId = spi->cur_res_id;
if (spi->field_80) {
int16 x1, x2, y1, y2;
@@ -91,7 +91,7 @@
x -= spi->pos.x;
y -= spi->pos.y;
- loadImgSpot(spi->field_4C, state, x1, y1);
+ loadImgSpot(spi->cur_res_id, state, x1, y1);
loadImgSpot(spi->field_80, state, x2, y2);
x += (x2 - x1);
@@ -115,8 +115,8 @@
state = spi->cur_img_state;
}
- rot_angle = spi->field_68;
- zoom = spi->field_6C;
+ rot_angle = spi->cur_rot_angle;
+ zoom = spi->cur_zoom;
if ((spi->flags & kSFZoomed) || (spi->flags & kSFRotated)) {
if (spi->flags & kSFZoomed && zoom) {
x = x * 256 / zoom;
@@ -757,7 +757,7 @@
_spriteTable[spriteId].flags = 0;
else
_spriteTable[spriteId].flags = kSFChanged | kSFBlitDirectly;
- _spriteTable[spriteId].field_4C = 0;
+ _spriteTable[spriteId].cur_res_id = 0;
_spriteTable[spriteId].cur_img_state = 0;
_spriteTable[spriteId].res_wiz_states = 0;
}
@@ -1242,10 +1242,10 @@
}
spi->cur_img_state = wiz.img.state = res_state;
- spi->field_4C = wiz.img.resNum = res_id;
+ spi->cur_res_id = wiz.img.resNum = res_id;
wiz.processFlags = kWPFNewState | kWPFSetPos;
- spi->field_68 = spi->rot_angle;
- spi->field_6C = spi->zoom;
+ spi->cur_rot_angle = spi->rot_angle;
+ spi->cur_zoom = spi->zoom;
spi->pos.x = wiz.img.x1;
spi->pos.y = wiz.img.y1;
bboxPtr = &spi->bbox;
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sprite_he.h 27 Feb 2005 03:36:33 -0000 1.19
+++ sprite_he.h 6 Mar 2005 04:31:02 -0000 1.20
@@ -81,15 +81,15 @@
int ty;
int field_44;
int cur_img_state;
- int field_4C;
+ int cur_res_id;
int imglist_num;
int field_54;
int res_wiz_states;
int rot_angle;
int zoom;
int field_64;
- int field_68;
- int field_6C;
+ int cur_rot_angle;
+ int cur_zoom;
int imgFlags;
int field_74;
int field_78;
More information about the Scummvm-git-logs
mailing list