gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21174) -Add: Use a progressive back-off mechanism to reduce wasting build attempts at unbuildable industries.

Browse Source
This commit is contained in:
alberth 2010-11-13 15:20:57 +00:00
parent a245db6360
commit 0c775e5750
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/industry_cmd.cpp
View File

@ -1972,6 +1972,8 @@ void IndustryTypeBuildData::Reset()
{
this->probability = 0;
this->target_count = 0;
this->max_wait = 1;
this->wait_count = 0;
}
/** Completely reset the industry build data. */
@ -2150,6 +2152,7 @@ void IndustryBuildData::TryBuildNewIndustry()
for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) {
int difference = this->builddata[it].target_count - Industry::GetIndustryTypeCount(it);
missing += difference;
if (this->builddata[it].wait_count > 0) continue; // This type may not be built now.
if (difference > 0) {
total_prob += difference;
count++;
@ -2166,6 +2169,7 @@ void IndustryBuildData::TryBuildNewIndustry()
uint32 r = 0; // Initialized to silence the compiler.
if (count > 1) r = RandomRange(total_prob);
for (it = 0; it < NUM_INDUSTRYTYPES; it++) {
if (this->builddata[it].wait_count > 0) continue; // Type may not be built now.
int difference = this->builddata[it].target_count - Industry::GetIndustryTypeCount(it);
if (difference <= 0) continue; // Too many of this kind.
if (count == 1) break;
@ -2176,10 +2180,19 @@ void IndustryBuildData::TryBuildNewIndustry()
/* Try to create the industry. */
const Industry *ind = PlaceIndustry(it, IACT_RANDOMCREATION, false);
if (ind != NULL) {
if (ind == NULL) {
this->builddata[it].wait_count = this->builddata[it].max_wait + 1; // Compensate for decrementing below.
this->builddata[it].max_wait = min(1000, this->builddata[it].max_wait + 2);
} else {
AdvertiseIndustryOpening(ind);
this->builddata[it].max_wait = max(this->builddata[it].max_wait / 2, 1); // Reduce waiting time of the industry type.
}
}
/* Decrement wait counters. */
for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) {
if (this->builddata[it].wait_count > 0) this->builddata[it].wait_count--;
}
}
/**