summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbelugas <belugas@openttd.org>2007-08-21 00:29:10 +0000
committerbelugas <belugas@openttd.org>2007-08-21 00:29:10 +0000
commita354a6af9658258df2c8224d470073c011e77a2a (patch)
tree87dda9efb498affa48f42cfdf58816b08a631ac6
parent8ef0cbbdf5bf72d2901d8afb898aee5e8d601d01 (diff)
downloadopenttd-a354a6af9658258df2c8224d470073c011e77a2a.tar.xz
(svn r10955) -Fix: The substitute prop (0x08) of industry tiles does not behave as prop 0x08 of industry. Therefore, do not disable the old industry with value of 0xFF. Not a bug fix, just a spec compliance correction...
-rw-r--r--src/newgrf.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index f0340e2a3..bb7dbe3ac 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1724,12 +1724,7 @@ static bool IndustrytilesChangeInfo(uint indtid, int numinfo, int prop, byte **b
IndustryTileSpec **tilespec = &_cur_grffile->indtspec[indtid + i];
byte subs_id = grf_load_byte(&buf);
- if (subs_id == 0xFF) {
- /* Instead of defining a new industry, a substitute industry id
- * of 0xFF disables the old industry with the current id. */
- tsp->enabled = false;
- continue;
- } else if (subs_id >= NEW_INDUSTRYTILEOFFSET) {
+ if (subs_id >= NEW_INDUSTRYTILEOFFSET) {
/* The substitute id must be one of the original industry tile. */
grfmsg(2, "IndustryTilesChangeInfo: Attempt to use new industry tile %u as substitute industry tile for %u. Ignoring.", subs_id, indtid + i);
return false;