mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11402) -Fix [FS#1382]: incorrect handling of industry behaviour 'must be in town with population large than 1200'
This commit is contained in:
parent
2e44d2aedb
commit
63b36d9330
|
@ -1233,7 +1233,7 @@ static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable
|
||||||
refused_slope |= IsSlopeRefused(tileh, its->slopes_refused);
|
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)) {
|
if (!IsTileType(cur_tile, MP_HOUSE)) {
|
||||||
_error_message = STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS;
|
_error_message = STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS;
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -1315,7 +1315,7 @@ static const IndustrySpec _origin_industry_specs[NEW_INDUSTRYOFFSET] = {
|
||||||
CT_VALUABLES, 6, CT_INVALID, 0, 5,
|
CT_VALUABLES, 6, CT_INVALID, 0, 5,
|
||||||
CT_VALUABLES, 0, CT_INVALID, 0, CT_INVALID, 0,
|
CT_VALUABLES, 0, CT_INVALID, 0, CT_INVALID, 0,
|
||||||
INDUSTRYLIFE_BLACK_HOLE, 1 << LT_TEMPERATE,
|
INDUSTRYLIFE_BLACK_HOLE, 1 << LT_TEMPERATE,
|
||||||
INDUSTRYBEH_TOWN1200_MORE | INDUSTRYBEH_ONLY_INTOWN,
|
INDUSTRYBEH_TOWN1200_MORE,
|
||||||
STR_480E_BANK, STR_482D_NEW_UNDER_CONSTRUCTION,
|
STR_480E_BANK, STR_482D_NEW_UNDER_CONSTRUCTION,
|
||||||
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
|
STR_4832_ANNOUNCES_IMMINENT_CLOSURE, STR_4835_INCREASES_PRODUCTION, STR_4839_PRODUCTION_DOWN_BY_50),
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue