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

(svn r20736) -Codechange: Introduce a new function for trying to create a new industry.

release/1.1
alberth 2010-09-04 11:59:12 +00:00
parent 6c34a044c8
commit fcf92a20e2
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/industry_cmd.cpp
View File

@ -1890,6 +1890,24 @@ static const byte _numof_industry_table[] = {
80, // high 80, // high
}; };
/**
* Try to place the industry in the game.
* Since there is no feedback why placement fails, there is no other option
* than to try a few times before concluding it does not work.
* @param type Industry type of the desired industry.
* @param try_hard Try very hard to find a place. (Used to place at least one industry per type.)
* @return Pointer to created industry, or \c NULL if creation failed.
*/
static Industry *PlaceIndustry(IndustryType type, bool try_hard)
{
uint tries = try_hard ? 10000u : 2000u;
for (; tries > 0; tries--) {
Industry *ind = CreateNewIndustry(RandomTile(), type);
if (ind != NULL) return ind;
}
return NULL;
}
/** /**
* Try to build a industry on the map. * Try to build a industry on the map.
* @param type IndustryType of the desired industry * @param type IndustryType of the desired industry
@ -1900,10 +1918,7 @@ static void PlaceInitialIndustry(IndustryType type, bool try_hard)
Backup<CompanyByte> cur_company(_current_company, OWNER_NONE, FILE_LINE); Backup<CompanyByte> cur_company(_current_company, OWNER_NONE, FILE_LINE);
IncreaseGeneratingWorldProgress(GWP_INDUSTRY); IncreaseGeneratingWorldProgress(GWP_INDUSTRY);
PlaceIndustry(type, try_hard);
for (uint i = 0; i < (try_hard ? 10000u : 2000u); i++) {
if (CreateNewIndustry(RandomTile(), type) != NULL) break;
}
cur_company.Restore(); cur_company.Restore();
} }
@ -2023,13 +2038,8 @@ static void MaybeNewIndustry()
} }
/* try to create 2000 times this industry */ /* try to create 2000 times this industry */
Industry *ind; // Will receive the industry's creation pointer. Industry *ind = PlaceIndustry(cumulative_probs[j].ind, false);
num = 2000; if (ind == NULL) return;
for (;;) {
ind = CreateNewIndustry(RandomTile(), cumulative_probs[j].ind);
if (ind != NULL) break;
if (--num == 0) return;
}
const IndustrySpec *ind_spc = GetIndustrySpec(cumulative_probs[j].ind); const IndustrySpec *ind_spc = GetIndustrySpec(cumulative_probs[j].ind);
SetDParam(0, ind_spc->name); SetDParam(0, ind_spc->name);