diff options
author | Travis Howell | 2005-03-06 04:31:02 +0000 |
---|---|---|
committer | Travis Howell | 2005-03-06 04:31:02 +0000 |
commit | 0d3319000886bff139b02c0723f0483213640b31 (patch) | |
tree | 943f49ae68a69857eab3c79469a375d951d95818 | |
parent | 524d3310c45e2209eb8a2fbf802103fea5e3efa8 (diff) | |
download | scummvm-rg350-0d3319000886bff139b02c0723f0483213640b31.tar.gz scummvm-rg350-0d3319000886bff139b02c0723f0483213640b31.tar.bz2 scummvm-rg350-0d3319000886bff139b02c0723f0483213640b31.zip |
Rename sprite fields
svn-id: r16999
-rw-r--r-- | scumm/sprite_he.cpp | 18 | ||||
-rw-r--r-- | scumm/sprite_he.h | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/scumm/sprite_he.cpp b/scumm/sprite_he.cpp index b383fbfdcf..f8eb27f777 100644 --- a/scumm/sprite_he.cpp +++ b/scumm/sprite_he.cpp @@ -44,7 +44,7 @@ int ScummEngine_v90he::findSpriteWithClassOf(int x, int y, int spriteGroupId, in 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 ScummEngine_v90he::findSpriteWithClassOf(int x, int y, int spriteGroupId, in 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 @@ int ScummEngine_v90he::findSpriteWithClassOf(int x, int y, int spriteGroupId, in 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 @@ int ScummEngine_v90he::findSpriteWithClassOf(int x, int y, int spriteGroupId, in 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 @@ void ScummEngine_v90he::spriteAddImageToList(int spriteId, int imageNum, int *sp _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 @@ void ScummEngine_v90he::spritesProcessWiz(bool arg) { } 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; diff --git a/scumm/sprite_he.h b/scumm/sprite_he.h index 16373fc109..9dccdcaabb 100644 --- a/scumm/sprite_he.h +++ b/scumm/sprite_he.h @@ -81,15 +81,15 @@ struct SpriteInfo { 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; |