Mercurial > hg > openttd
changeset 14567:44028a741bb7 draft
(svn r19138) -Codechange: Rename CheckMultipleIndustryInTown() to FindTownForIndustry().
author | alberth <alberth@openttd.org> |
---|---|
date | Mon, 15 Feb 2010 11:04:27 +0000 (2010-02-15) |
parents | 64ebad447859 |
children | 7f130ddfafb1 |
files | src/industry_cmd.cpp |
diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1277,7 +1277,13 @@ CheckNewIndustry_OilRig, ///< CHECK_OIL_RIG }; -static const Town *CheckMultipleIndustryInTown(TileIndex tile, int type) +/** Find a town for the industry, while checking for multiple industries in the same town. + * @param tile Position of the industry to build. + * @param type Industry type. + * @param [out] err_mesg Error message, if any. + * @return Town for the new industry, \c NULL if no good town can be found. + */ +static const Town *FindTownForIndustry(TileIndex tile, int type) { const Town *t; const Industry *i; @@ -1701,7 +1707,7 @@ if (!custom_shape_check && _settings_game.game_creation.land_generator == LG_TERRAGENESIS && _generating_world && !_ignore_restrictions && !CheckIfCanLevelIndustryPlatform(tile, DC_NO_WATER, it, type)) return NULL; if (!CheckIfFarEnoughFromIndustry(tile, type)) return NULL; - const Town *t = CheckMultipleIndustryInTown(tile, type); + const Town *t = FindTownForIndustry(tile, type); if (t == NULL) return NULL; if (!CheckIfIndustryIsAllowed(tile, type, t)) return NULL;