gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-08 23:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r19701) -Fix [FS#3787]: Check for industry availability more thoroughly and cancel object placement when selecting not available industries.

Browse Source
This commit is contained in:
frosch 2010-04-23 21:47:03 +00:00
parent 7a56196d98
commit ca9a015984
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ai/api/ai_industrytype.cpp
View File

@ -14,6 +14,7 @@
#include "../../command_type.h" #include "../../command_type.h"
#include "../../strings_func.h" #include "../../strings_func.h"
#include "../../industry.h" #include "../../industry.h"
#include "../../newgrf_industries.h"
#include "../../core/random_func.hpp" #include "../../core/random_func.hpp"
/* static */ bool AIIndustryType::IsValidIndustryType(IndustryType industry_type) /* static */ bool AIIndustryType::IsValidIndustryType(IndustryType industry_type)
@ -88,6 +89,8 @@
/* static */ bool AIIndustryType::CanBuildIndustry(IndustryType industry_type) /* static */ bool AIIndustryType::CanBuildIndustry(IndustryType industry_type)
{ {
if (!IsValidIndustryType(industry_type)) return false; if (!IsValidIndustryType(industry_type)) return false;
if (!::CheckIfCallBackAllowsAvailability(industry_type, IACT_USERCREATION)) return false;
if (!::GetIndustrySpec(industry_type)->IsRawIndustry()) return true; if (!::GetIndustrySpec(industry_type)->IsRawIndustry()) return true;
/* raw_industry_construction == 1 means "Build as other industries" */ /* raw_industry_construction == 1 means "Build as other industries" */
@ -97,7 +100,9 @@
/* static */ bool AIIndustryType::CanProspectIndustry(IndustryType industry_type) /* static */ bool AIIndustryType::CanProspectIndustry(IndustryType industry_type)
{ {
if (!IsValidIndustryType(industry_type)) return false; if (!IsValidIndustryType(industry_type)) return false;
if (!::GetIndustrySpec(industry_type)->IsRawIndustry()) return false; if (!::GetIndustrySpec(industry_type)->IsRawIndustry()) return false;
if (!::CheckIfCallBackAllowsAvailability(industry_type, IACT_USERCREATION)) return false;
/* raw_industry_construction == 2 means "prospect" */ /* raw_industry_construction == 2 means "prospect" */
return _settings_game.construction.raw_industry_construction == 2; return _settings_game.construction.raw_industry_construction == 2;

4
src/industry_cmd.cpp
View File

@ -1764,6 +1764,10 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
return CMD_ERROR; return CMD_ERROR;
} }
if (_game_mode != GM_EDITOR && !CheckIfCallBackAllowsAvailability(it, IACT_USERCREATION)) {
return CMD_ERROR;
}
Industry *ind = NULL; Industry *ind = NULL;
if (_game_mode != GM_EDITOR && _settings_game.construction.raw_industry_construction == 2 && indspec->IsRawIndustry()) { if (_game_mode != GM_EDITOR && _settings_game.construction.raw_industry_construction == 2 && indspec->IsRawIndustry()) {
if (flags & DC_EXEC) { if (flags & DC_EXEC) {

6
src/industry_gui.cpp
View File

@ -463,8 +463,10 @@ public:
this->SetDirty(); this->SetDirty();
if ((_game_mode != GM_EDITOR && _settings_game.construction.raw_industry_construction == 2 && indsp != NULL && indsp->IsRawIndustry()) || if (GetCallbackWnd() == this &&
this->selected_type == INVALID_INDUSTRYTYPE) { ((_game_mode != GM_EDITOR && _settings_game.construction.raw_industry_construction == 2 && indsp != NULL && indsp->IsRawIndustry()) ||
this->selected_type == INVALID_INDUSTRYTYPE ||
!this->enabled[this->selected_index])) {
/* Reset the button state if going to prospecting or "build many industries" */ /* Reset the button state if going to prospecting or "build many industries" */
this->RaiseButtons(); this->RaiseButtons();
ResetObjectToPlace(); ResetObjectToPlace();