(svn r11402) -Fix [FS#1382]: incorrect handling of industry behaviour 'must be in town with population large than 1200'

This commit is contained in:
glx 2007-11-11 00:04:52 +00:00
parent 2e44d2aedb
commit 63b36d9330
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -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),