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

(svn r21173) -Codechange: Don't recompute target industry counts each time.

release/1.1
alberth 2010-11-13 15:19:43 +00:00
parent eb4ab0091a
commit a245db6360
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/industry.h
View File

@ -153,7 +153,7 @@ struct IndustryTypeBuildData {
void Reset(); void Reset();
void GetIndustryTypeData(IndustryType it); bool GetIndustryTypeData(IndustryType it);
}; };
/** /**

17
src/industry_cmd.cpp
View File

@ -2093,20 +2093,29 @@ void Industry::RecomputeProductionMultipliers()
/** /**
* Set the #probability field for the industry type \a it for a running game. * Set the #probability field for the industry type \a it for a running game.
* @param it Industry type. * @param it Industry type.
* @return The field has changed value.
*/ */
void IndustryTypeBuildData::GetIndustryTypeData(IndustryType it) bool IndustryTypeBuildData::GetIndustryTypeData(IndustryType it)
{ {
this->probability = GetIndustryGamePlayProbability(it); uint32 probability = GetIndustryGamePlayProbability(it);
bool changed = probability != this->probability;
this->probability = probability;
return changed;
} }
/** Decide how many industries of each type are needed. */ /** Decide how many industries of each type are needed. */
void IndustryBuildData::SetupTargetCount() void IndustryBuildData::SetupTargetCount()
{ {
bool changed = false;
uint num_planned = 0; // Number of industries planned in the industry build data.
for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) { for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) {
this->builddata[it].GetIndustryTypeData(it); changed |= this->builddata[it].GetIndustryTypeData(it);
num_planned += this->builddata[it].target_count;
} }
uint total_amount = this->wanted_inds >> 16; // Desired total number of industries. uint total_amount = this->wanted_inds >> 16; // Desired total number of industries.
changed |= num_planned != total_amount;
if (!changed) return; // All industries are still the same, no need to re-randomize.
uint32 total_prob = 0; // Sum of probabilities. uint32 total_prob = 0; // Sum of probabilities.
for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) { for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) {
this->builddata[it].target_count = 0; this->builddata[it].target_count = 0;