mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19183) -Codechange: Return CommandCost from FindTownForIndustry().

release/1.1
alberth 2010-02-21 14:57:27 +00:00
parent 50bdd29758
commit 676a8bda3e
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/industry_cmd.cpp
View File

@ -1270,27 +1270,27 @@ static CheckNewIndustryProc * const _check_new_industry_procs[CHECK_END] = {
/** Find a town for the industry, while checking for multiple industries in the same town. /** Find a town for the industry, while checking for multiple industries in the same town.
* @param tile Position of the industry to build. * @param tile Position of the industry to build.
* @param type Industry type. * @param type Industry type.
* @param [out] err_mesg Error message, if any. * @param [out] town Pointer to return town for the new industry, \c NULL is written if no good town can be found.
* @return Town for the new industry, \c NULL if no good town can be found. * @return Succeeded or failed command.
*
* @precond \c *t != NULL
* @postcon \c *t points to a town on success, and \c NULL on failure.
*/ */
static const Town *FindTownForIndustry(TileIndex tile, int type) static CommandCost FindTownForIndustry(TileIndex tile, int type, const Town **t)
{ {
const Town *t; *t = ClosestTownFromTile(tile, UINT_MAX);
if (_settings_game.economy.multiple_industry_per_town) return CommandCost();
const Industry *i; const Industry *i;
t = ClosestTownFromTile(tile, UINT_MAX);
if (_settings_game.economy.multiple_industry_per_town) return t;
FOR_ALL_INDUSTRIES(i) { FOR_ALL_INDUSTRIES(i) {
if (i->type == (byte)type && if (i->type == (byte)type && i->town == *t) {
i->town == t) { *t = NULL;
_error_message = STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN; return_cmd_error(STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN);
return NULL;
} }
} }
return t; return CommandCost();
} }
bool IsSlopeRefused(Slope current, Slope refused) bool IsSlopeRefused(Slope current, Slope refused)
@ -1708,8 +1708,11 @@ static Industry *CreateNewIndustryHelper(TileIndex tile, IndustryType type, DoCo
ret.SetGlobalErrorMessage(); ret.SetGlobalErrorMessage();
if (ret.Failed()) return NULL; if (ret.Failed()) return NULL;
const Town *t = FindTownForIndustry(tile, type); const Town *t = NULL;
if (t == NULL) return NULL; ret = FindTownForIndustry(tile, type, &t);
ret.SetGlobalErrorMessage();
if (ret.Failed()) return NULL;
assert(t != NULL);
ret = CheckIfIndustryIsAllowed(tile, type, t); ret = CheckIfIndustryIsAllowed(tile, type, t);
ret.SetGlobalErrorMessage(); ret.SetGlobalErrorMessage();