mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r19362) -Fix [FS#3667] (r19270): Failure to prospect an industry should not cause a crash.
This commit is contained in:
parent
8d033e964e
commit
384e870be2
|
@ -1824,19 +1824,17 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
|
|||
if (ret.Failed()) return ret;
|
||||
}
|
||||
|
||||
if (flags & DC_EXEC) {
|
||||
assert(ind != NULL);
|
||||
if (_game_mode != GM_EDITOR) {
|
||||
SetDParam(0, indspec->name);
|
||||
if (indspec->new_industry_text > STR_LAST_STRINGID) {
|
||||
SetDParam(1, STR_TOWN_NAME);
|
||||
SetDParam(2, ind->town->index);
|
||||
} else {
|
||||
SetDParam(1, ind->town->index);
|
||||
}
|
||||
AddIndustryNewsItem(indspec->new_industry_text, NS_INDUSTRY_OPEN, ind->index);
|
||||
AI::BroadcastNewEvent(new AIEventIndustryOpen(ind->index));
|
||||
if ((flags & DC_EXEC) && ind != NULL && _game_mode != GM_EDITOR) {
|
||||
/* Created a new industry in-game, advertise the event. */
|
||||
SetDParam(0, indspec->name);
|
||||
if (indspec->new_industry_text > STR_LAST_STRINGID) {
|
||||
SetDParam(1, STR_TOWN_NAME);
|
||||
SetDParam(2, ind->town->index);
|
||||
} else {
|
||||
SetDParam(1, ind->town->index);
|
||||
}
|
||||
AddIndustryNewsItem(indspec->new_industry_text, NS_INDUSTRY_OPEN, ind->index);
|
||||
AI::BroadcastNewEvent(new AIEventIndustryOpen(ind->index));
|
||||
}
|
||||
|
||||
return CommandCost(EXPENSES_OTHER, indspec->GetConstructionCost());
|
||||
|
|
Loading…
Reference in New Issue