(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...
authorbelugas
Tue, 21 Aug 2007 00:29:10 +0000
changeset 7459 1b30a380ce60
parent 7458 5ffdb894e08c
child 7460 78e4e3c62f91
(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...
src/newgrf.cpp
--- a/src/newgrf.cpp	Mon Aug 20 20:29:22 2007 +0000
+++ b/src/newgrf.cpp	Tue Aug 21 00:29:10 2007 +0000
@@ -1724,12 +1724,7 @@
 				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;