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/table | |
parent | 4efa2efdbba6f08b2ee4ca3aacb2aeb792429af4 (diff) | |
download | openttd-e2e26190d55fe5a7e053791ac9bce095b303be10.tar.xz |
(svn r20623) -Codechange: unify the storing of animation related information
Diffstat (limited to 'src/table')
-rw-r--r-- | src/table/airporttiles.h | 4 | ||||
-rw-r--r-- | src/table/build_industry.h | 2 | ||||
-rw-r--r-- | src/table/town_land.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/table/airporttiles.h b/src/table/airporttiles.h index 37e7d512f..47a963158 100644 --- a/src/table/airporttiles.h +++ b/src/table/airporttiles.h @@ -13,9 +13,9 @@ #define AIRPORTTILES_H /** Writes all airport tile properties in the AirportTile struct */ -#define AT(num_frames, anim_speed) {(1 << 8) | num_frames, anim_speed, STR_NULL, 0, 0, 0, true, GRFFileProps(INVALID_AIRPORTTILE)} +#define AT(num_frames, anim_speed) {{num_frames, ANIM_STATUS_LOOPING, anim_speed, 0}, STR_NULL, 0, 0, true, GRFFileProps(INVALID_AIRPORTTILE)} /** Writes an airport tile without animation in the AirportTile struct */ -#define AT_NOANIM {0xFFFF, 2, STR_NULL, 0, 0, 0, true, GRFFileProps(INVALID_AIRPORTTILE)} +#define AT_NOANIM {{0, ANIM_STATUS_NO_ANIMATION, 2, 0}, STR_NULL, 0, 0, true, GRFFileProps(INVALID_AIRPORTTILE)} /** * All default airport tiles. diff --git a/src/table/build_industry.h b/src/table/build_industry.h index cb2c7d92e..f7e9708ab 100644 --- a/src/table/build_industry.h +++ b/src/table/build_industry.h @@ -1581,7 +1581,7 @@ static const IndustrySpec _origin_industry_specs[NEW_INDUSTRYOFFSET] = { * @param a2 next frame of animation * @param a3 chooses between animation or construction state */ -#define MT(ca1, c1, ca2, c2, ca3, c3, sl, a1, a2, a3) {{c1, c2, c3}, {ca1, ca2, ca3}, sl, a1, a2, a3, 0, 0xFFFF, 2, 0, INDTILE_SPECIAL_NONE, true, GRFFileProps(INVALID_INDUSTRYTILE)} +#define MT(ca1, c1, ca2, c2, ca3, c3, sl, a1, a2, a3) {{c1, c2, c3}, {ca1, ca2, ca3}, sl, a1, a2, a3, 0, {0, ANIM_STATUS_NO_ANIMATION, 2, 0}, INDTILE_SPECIAL_NONE, true, GRFFileProps(INVALID_INDUSTRYTILE)} static const IndustryTileSpec _origin_industry_tile_specs[NEW_INDUSTRYTILEOFFSET] = { /* Coal Mine */ MT(0, CT_INVALID, 0, CT_INVALID, 0, CT_INVALID, SLOPE_STEEP, INDUSTRYTILE_NOANIM, INDUSTRYTILE_NOANIM, false), diff --git a/src/table/town_land.h b/src/table/town_land.h index 713c35013..402ad9d4d 100644 --- a/src/table/town_land.h +++ b/src/table/town_land.h @@ -1813,7 +1813,7 @@ assert_compile(lengthof(_town_draw_tile_data) == (NEW_HOUSE_OFFSET) * 4 * 4); */ #define MS(mnd, mxd, p, rc, bn, rr, mg, ca1, ca2, ca3, bf, ba, cg1, cg2, cg3) \ {mnd, mxd, p, rc, bn, rr, mg, {ca1, ca2, ca3}, {cg1, cg2, cg3}, bf, ba, true, \ - GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, 16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, 0, 2, 0, 0} + GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, 16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, {0, 2, 0, 0}, 0, 0} /** House specifications from original data */ static const HouseSpec _original_house_specs[] = { /** |