Merge remote-tracking branch 'upstream/1.11' into 1.11

2021-04-01 17:33:31 +03:00
parent 14f71187eb ec1f91e865
commit 93d8111960
125 changed files with 2828 additions and 1149 deletions
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -2178,6 +2178,7 @@ static Industry *CreateNewIndustry(TileIndex tile, IndustryType type, IndustryAv
 	Industry *i = nullptr;
 	size_t layout_index = RandomRange((uint32)indspec->layouts.size());
 	CommandCost ret = CreateNewIndustryHelper(tile, type, DC_EXEC, indspec, layout_index, seed, GB(seed2, 0, 16), OWNER_NONE, creation_type, &i);
+	(void)ret; // assert only
 	assert(i != nullptr || ret.Failed());
 	return i;
 }