summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-11-11 00:04:52 +0000
committerglx <glx@openttd.org>2007-11-11 00:04:52 +0000
commit63b36d9330dde1706dd7c2bea5b3f54db782f59c (patch)
treef5b220d7bfd506e89a769bfdac5c32a2eec50246
parent2e44d2aedbaeef2410e28e93f691c1deb5a3db78 (diff)
downloadopenttd-63b36d9330dde1706dd7c2bea5b3f54db782f59c.tar.xz
(svn r11402) -Fix [FS#1382]: incorrect handling of industry behaviour 'must be in town with population large than 1200'
-rw-r--r--src/industry_cmd.cpp2
-rw-r--r--src/table/build_industry.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index 621495b94..0a7e6a502 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -1233,7 +1233,7 @@ static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable
refused_slope |= IsSlopeRefused(tileh, its->slopes_refused);
}
- if (ind_behav & INDUSTRYBEH_ONLY_INTOWN) {
+ if (ind_behav & (INDUSTRYBEH_ONLY_INTOWN | INDUSTRYBEH_TOWN1200_MORE)) {
if (!IsTileType(cur_tile, MP_HOUSE)) {
_error_message = STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS;
return false;
diff --git a/src/table/build_industry.h b/src/table/build_industry.h
index 506c81fd0..9c2f2eb47 100644
--- a/src/table/build_industry.h
+++ b/src/table/build_industry.h
@@ -1315,7 +1315,7 @@ static const IndustrySpec _origin_industry_specs[NEW_INDUSTRYOFFSET] = {
CT_VALUABLES, 6, CT_INVALID, 0, 5,
CT_VALUABLES, 0, CT_INVALID, 0, CT_INVALID, 0,
INDUSTRYLIFE_BLACK_HOLE, 1 << LT_TEMPERATE,
- INDUSTRYBEH_TOWN1200_MORE | INDUSTRYBEH_ONLY_INTOWN,
+ INDUSTRYBEH_TOWN1200_MORE,
STR_480E_BANK, STR_482D_NEW_UNDER_CONSTRUCTION,
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),