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

Codefix: Use correct type for IndustryType in several industry functions. (#13096)

pull/13094/head
Peter Nelson 2024-11-19 20:32:06 +00:00 committed by GitHub
parent fcac5479f1
commit 640a270ed6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/industry_cmd.cpp
View File

@ -1428,14 +1428,14 @@ static CheckNewIndustryProc * const _check_new_industry_procs[CHECK_END] = {
* @pre \c *t != nullptr * @pre \c *t != nullptr
* @post \c *t points to a town on success, and \c nullptr on failure. * @post \c *t points to a town on success, and \c nullptr on failure.
*/ */
static CommandCost FindTownForIndustry(TileIndex tile, int type, Town **t) static CommandCost FindTownForIndustry(TileIndex tile, IndustryType type, Town **t)
{ {
*t = ClosestTownFromTile(tile, UINT_MAX); *t = ClosestTownFromTile(tile, UINT_MAX);
if (_settings_game.economy.multiple_industry_per_town) return CommandCost(); if (_settings_game.economy.multiple_industry_per_town) return CommandCost();
for (const Industry *i : Industry::Iterate()) { for (const Industry *i : Industry::Iterate()) {
if (i->type == (uint8_t)type && i->town == *t) { if (i->type == type && i->town == *t) {
*t = nullptr; *t = nullptr;
return_cmd_error(STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN); return_cmd_error(STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN);
} }
@ -1530,7 +1530,7 @@ static CommandCost CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTil
* @param[out] custom_shape_check Perform custom check for the site. * @param[out] custom_shape_check Perform custom check for the site.
* @return Failed or succeeded command. * @return Failed or succeeded command.
*/ */
static CommandCost CheckIfIndustryTileSlopes(TileIndex tile, const IndustryTileLayout &layout, size_t layout_index, int type, uint16_t initial_random_bits, Owner founder, IndustryAvailabilityCallType creation_type, bool *custom_shape_check = nullptr) static CommandCost CheckIfIndustryTileSlopes(TileIndex tile, const IndustryTileLayout &layout, size_t layout_index, IndustryType type, uint16_t initial_random_bits, Owner founder, IndustryAvailabilityCallType creation_type, bool *custom_shape_check = nullptr)
{ {
bool refused_slope = false; bool refused_slope = false;
bool custom_shape = false; bool custom_shape = false;
@ -1572,7 +1572,7 @@ static CommandCost CheckIfIndustryTileSlopes(TileIndex tile, const IndustryTileL
* @param t Town authority that the industry belongs to. * @param t Town authority that the industry belongs to.
* @return Succeeded or failed command. * @return Succeeded or failed command.
*/ */
static CommandCost CheckIfIndustryIsAllowed(TileIndex tile, int type, const Town *t) static CommandCost CheckIfIndustryIsAllowed(TileIndex tile, IndustryType type, const Town *t)
{ {
if ((GetIndustrySpec(type)->behaviour & INDUSTRYBEH_TOWN1200_MORE) && t->cache.population < 1200) { if ((GetIndustrySpec(type)->behaviour & INDUSTRYBEH_TOWN1200_MORE) && t->cache.population < 1200) {
return_cmd_error(STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200); return_cmd_error(STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200);
@ -1689,7 +1689,7 @@ static bool CheckIfCanLevelIndustryPlatform(TileIndex tile, DoCommandFlag flags,
* @param type Type of the new industry. * @param type Type of the new industry.
* @return Succeeded or failed command. * @return Succeeded or failed command.
*/ */
static CommandCost CheckIfFarEnoughFromConflictingIndustry(TileIndex tile, int type) static CommandCost CheckIfFarEnoughFromConflictingIndustry(TileIndex tile, IndustryType type)
{ {
const IndustrySpec *indspec = GetIndustrySpec(type); const IndustrySpec *indspec = GetIndustrySpec(type);