diff options
| -rw-r--r-- | src/ai/api/ai_industrytype.cpp | 2 | ||||
| -rw-r--r-- | src/industry_cmd.cpp | 20 | ||||
| -rw-r--r-- | src/industry_gui.cpp | 4 |
3 files changed, 12 insertions, 14 deletions
diff --git a/src/ai/api/ai_industrytype.cpp b/src/ai/api/ai_industrytype.cpp index 86e5269d7..ce19235c8 100644 --- a/src/ai/api/ai_industrytype.cpp +++ b/src/ai/api/ai_industrytype.cpp @@ -108,7 +108,7 @@ EnforcePrecondition(false, AIMap::IsValidTile(tile)); uint32 seed = ::InteractiveRandom(); - return AIObject::DoCommand(tile, (::InteractiveRandomRange(::GetIndustrySpec(industry_type)->num_table) << 16) | industry_type, seed, CMD_BUILD_INDUSTRY); + return AIObject::DoCommand(tile, (::InteractiveRandomRange(::GetIndustrySpec(industry_type)->num_table) << 8) | industry_type, seed, CMD_BUILD_INDUSTRY); } /* static */ bool AIIndustryType::ProspectIndustry(IndustryType industry_type) diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index a485dd75e..a86551aa7 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1671,23 +1671,20 @@ static Industry *CreateNewIndustryHelper(TileIndex tile, IndustryType type, DoCo * @param tile tile where industry is built * @param flags of operations to conduct * @param p1 various bitstuffed elements - * - p1 = (bit 0 - 15) - industry type see build_industry.h and see industry.h - * - p1 = (bit 16 - 31) - first layout to try + * - p1 = (bit 0 - 7) - industry type see build_industry.h and see industry.h + * - p1 = (bit 8 - 15) - first layout to try * @param p2 seed to use for variable 8F * @return index of the newly create industry, or CMD_ERROR if it failed */ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { - IndustryType it = GB(p1, 0, 16); + IndustryType it = GB(p1, 0, 8); if (it >= NUM_INDUSTRYTYPES) return CMD_ERROR; const IndustrySpec *indspec = GetIndustrySpec(it); - const Industry *ind = NULL; /* Check if the to-be built/founded industry is available for this climate. */ - if (!indspec->enabled) { - return CMD_ERROR; - } + if (!indspec->enabled) return CMD_ERROR; /* If the setting for raw-material industries is not on, you cannot build raw-material industries. * Raw material industries are industries that do not accept cargo (at least for now) */ @@ -1695,6 +1692,7 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin return CMD_ERROR; } + const Industry *ind = NULL; if (_game_mode != GM_EDITOR && _settings_game.construction.raw_industry_construction == 2 && indspec->IsRawIndustry()) { if (flags & DC_EXEC) { /* Prospected industries are build as OWNER_TOWN to not e.g. be build on owned land of the founder */ @@ -1709,7 +1707,7 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin * because parameter evaluation order is not guaranteed in the c++ standard */ tile = RandomTile(); - ind = CreateNewIndustryHelper(tile, p1, flags, indspec, RandomRange(indspec->num_table), p2, founder); + ind = CreateNewIndustryHelper(tile, it, flags, indspec, RandomRange(indspec->num_table), p2, founder); if (ind != NULL) { break; } @@ -1720,16 +1718,16 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin } else { int count = indspec->num_table; const IndustryTileTable * const *itt = indspec->table; - int num = GB(p1, 16, 16); + int num = GB(p1, 8, 8); if (num >= count) return CMD_ERROR; _error_message = STR_ERROR_SITE_UNSUITABLE; do { if (--count < 0) return CMD_ERROR; if (--num < 0) num = indspec->num_table - 1; - } while (!CheckIfIndustryTilesAreFree(tile, itt[num], num, p1)); + } while (!CheckIfIndustryTilesAreFree(tile, itt[num], num, it)); - ind = CreateNewIndustryHelper(tile, p1, flags, indspec, num, p2, _current_company); + ind = CreateNewIndustryHelper(tile, it, flags, indspec, num, p2, _current_company); if (ind == NULL) return CMD_ERROR; } diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 8c33d9282..8cfd50cf7 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -385,7 +385,7 @@ public: _current_company = OWNER_NONE; _generating_world = true; _ignore_restrictions = true; - success = DoCommandP(tile, (InteractiveRandomRange(indsp->num_table) << 16) | this->selected_type, seed, CMD_BUILD_INDUSTRY | CMD_MSG(STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY)); + success = DoCommandP(tile, (InteractiveRandomRange(indsp->num_table) << 8) | this->selected_type, seed, CMD_BUILD_INDUSTRY | CMD_MSG(STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY)); if (!success) { SetDParam(0, indsp->name); ShowErrorMessage(_error_message, STR_ERROR_CAN_T_BUILD_HERE, pt.x, pt.y); @@ -394,7 +394,7 @@ public: _ignore_restrictions = false; _generating_world = false; } else { - success = DoCommandP(tile, (InteractiveRandomRange(indsp->num_table) << 16) | this->selected_type, seed, CMD_BUILD_INDUSTRY | CMD_MSG(STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY)); + success = DoCommandP(tile, (InteractiveRandomRange(indsp->num_table) << 8) | this->selected_type, seed, CMD_BUILD_INDUSTRY | CMD_MSG(STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY)); } /* If an industry has been built, just reset the cursor and the system */ |