cpp/openttd-patchpack/source Changeset - r14557:0378093d1b51

Changeset - r14557:0378093d1b51

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

alberth - 14 years ago 2010-02-15 11:04:27
alberth@openttd.org

(svn r19138) -Codechange: Rename CheckMultipleIndustryInTown() to FindTownForIndustry().

1 file changed with 8 insertions and 2 deletions:

src/industry_cmd.cpp

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -1274,13 +1274,19 @@ static CheckNewIndustryProc * const _che @@
 	CheckNewIndustry_Water,       ///< CHECK_WATER
 	CheckNewIndustry_Lumbermill,  ///< CHECK_LUMBERMILL
 	CheckNewIndustry_BubbleGen,   ///< CHECK_BUBBLEGEN
 	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;
 	t = ClosestTownFromTile(tile, UINT_MAX);
@@ @@ -1698,13 +1704,13 @@ static Industry *CreateNewIndustryHelper @@
 		if (!_check_new_industry_procs[indspec->check_proc](tile)) return NULL;
+	}
 	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;
 	if (!Industry::CanAllocateItem()) return NULL;

0 comments (0 inline, 0 general)