diff options
| author | belugas <belugas@openttd.org> | 2007-08-22 00:52:25 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2007-08-22 00:52:25 +0000 |
| commit | 116de48fdf097a35632a1dd0455afb80d1c12305 (patch) | |
| tree | 6761c82bf0e8cae22ffbffc7af4b16fb90465787 /src | |
| parent | a354a6af9658258df2c8224d470073c011e77a2a (diff) | |
| download | openttd-116de48fdf097a35632a1dd0455afb80d1c12305.tar.xz | |
(svn r10961) -Codechange: Flag default substitutes of industry/tiles with a value that cannot be legal.
This avoids the forest of coal mine error in the futur
Diffstat (limited to 'src')
| -rw-r--r-- | src/industry.h | 2 | ||||
| -rw-r--r-- | src/table/build_industry.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/industry.h b/src/industry.h index 68c19ebc1..c9cb87b9f 100644 --- a/src/industry.h +++ b/src/industry.h @@ -133,7 +133,7 @@ struct IndustryTileTable { /** Data related to the handling of grf files. Common to both industry and industry tile */ struct GRFFileProps { - uint8 subst_id; + uint16 subst_id; uint16 local_id; ///< id defined by the grf file for this industry struct SpriteGroup *spritegroup; ///< pointer to the different sprites of the industry const struct GRFFile *grffile; ///< grf file that introduced this industry diff --git a/src/table/build_industry.h b/src/table/build_industry.h index dc342a68a..ba378e8cb 100644 --- a/src/table/build_industry.h +++ b/src/table/build_industry.h @@ -1177,7 +1177,7 @@ enum { c1, c2, c3, proc, p1, r1, p2, r2, m, a1, im1, a2, im2, a3, im3, pr, clim, bev, in, intx, s1, s2, s3) \ {tbl, lengthof(tbl), min(255, d), d, pc, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m, \ {a1, a2, a3}, {{im1, 0}, {im2, 0}, {im3, 0}}, pr, clim, bev, col, in, intx, s1, s2, s3, {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, \ - sndc, snd, 0, 0, true, {0, 0, NULL, NULL, INVALID_INDUSTRYTYPE}} + sndc, snd, 0, 0, true, {INVALID_INDUSTRYTYPE, 0, NULL, NULL, INVALID_INDUSTRYTYPE}} /* Format: tile table count and sounds table cost multiplier appear chances(4ingame, 4random) map colour @@ -1573,7 +1573,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, 0, true, {0, 0, NULL, NULL, 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, 0xFFFF, 2, 0, 0, true, {INVALID_INDUSTRYTILE, 0, NULL, NULL, 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), |