diff options
| author | rubidium <rubidium@openttd.org> | 2010-08-26 15:31:40 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-08-26 15:31:40 +0000 |
| commit | e2e26190d55fe5a7e053791ac9bce095b303be10 (patch) | |
| tree | 94224f8433a94c28866b63347b64c3f7c8e4f201 /src/newgrf_industrytiles.cpp | |
| parent | 4efa2efdbba6f08b2ee4ca3aacb2aeb792429af4 (diff) | |
| download | openttd-e2e26190d55fe5a7e053791ac9bce095b303be10.tar.xz | |
(svn r20623) -Codechange: unify the storing of animation related information
Diffstat (limited to 'src/newgrf_industrytiles.cpp')
| -rw-r--r-- | src/newgrf_industrytiles.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp index afbbbf5cb..291d4df75 100644 --- a/src/newgrf_industrytiles.cpp +++ b/src/newgrf_industrytiles.cpp @@ -302,7 +302,7 @@ void AnimateNewIndustryTile(TileIndex tile) Industry *ind = Industry::GetByTile(tile); IndustryGfx gfx = GetIndustryGfx(tile); const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx); - byte animation_speed = itspec->animation_speed; + byte animation_speed = itspec->animation.speed; if (HasBit(itspec->callback_mask, CBM_INDT_ANIM_SPEED)) { uint16 callback_res = GetIndustryTileCallback(CBID_INDTILE_ANIMATION_SPEED, 0, 0, gfx, ind, tile); @@ -317,7 +317,7 @@ void AnimateNewIndustryTile(TileIndex tile) bool frame_set_by_callback = false; byte frame = GetAnimationFrame(tile); - uint16 num_frames = GB(itspec->animation_info, 0, 8); + uint16 num_frames = itspec->animation.frames; if (HasBit(itspec->callback_mask, CBM_INDT_ANIM_NEXT_FRAME)) { uint16 callback_res = GetIndustryTileCallback(CBID_INDTILE_ANIM_NEXT_FRAME, @@ -348,7 +348,7 @@ void AnimateNewIndustryTile(TileIndex tile) if (!frame_set_by_callback) { if (frame < num_frames) { frame++; - } else if (frame == num_frames && GB(itspec->animation_info, 8, 8) == 1) { + } else if (frame == num_frames && itspec->animation.status == ANIM_STATUS_LOOPING) { /* This animation loops, so start again from the beginning */ frame = 0; } else { @@ -386,7 +386,7 @@ bool StartStopIndustryTileAnimation(TileIndex tile, IndustryAnimationTrigger iat IndustryGfx gfx = GetIndustryGfx(tile); const IndustryTileSpec *itspec = GetIndustryTileSpec(gfx); - if (!HasBit(itspec->animation_triggers, iat)) return false; + if (!HasBit(itspec->animation.triggers, iat)) return false; Industry *ind = Industry::GetByTile(tile); ChangeIndustryTileAnimationFrame(itspec, tile, iat, random, gfx, ind); |