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

(svn r21167) -Codechange: Use IndustryBuildData::builddata instead of a local variable.

Browse Source
This commit is contained in:
alberth 2010-11-13 15:04:58 +00:00
parent 1bf94674df
commit e861487bcb
2 changed files with 49 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/industry.h
View File

@ -143,10 +143,19 @@ void ReleaseDisastersTargetingIndustry(IndustryID);
#define FOR_ALL_INDUSTRIES_FROM(var, start) FOR_ALL_ITEMS_FROM(Industry, industry_index, var, start) #define FOR_ALL_INDUSTRIES_FROM(var, start) FOR_ALL_ITEMS_FROM(Industry, industry_index, var, start)
#define FOR_ALL_INDUSTRIES(var) FOR_ALL_INDUSTRIES_FROM(var, 0) #define FOR_ALL_INDUSTRIES(var) FOR_ALL_INDUSTRIES_FROM(var, 0)
/** Data for managing the number of industries of a single industry type. */
struct IndustryTypeBuildData {
uint32 probability; ///< Relative probability of building this industry.
void GetIndustryTypeData(IndustryType it);
};
/** /**
* Data for managing the number and type of industries in the game. * Data for managing the number and type of industries in the game.
*/ */
struct IndustryBuildData { struct IndustryBuildData {
IndustryTypeBuildData builddata[NUM_INDUSTRYTYPES]; ///< Industry build data for every industry type.
void TryBuildNewIndustry(); void TryBuildNewIndustry();
}; };

66
src/industry_cmd.cpp
View File

@ -1871,6 +1871,8 @@ static uint32 GetScaledIndustryGenerationProbability(IndustryType it, bool *forc
*/ */
static uint16 GetIndustryGamePlayProbability(IndustryType it) static uint16 GetIndustryGamePlayProbability(IndustryType it)
{ {
if (_settings_game.difficulty.number_industries == 0) return 0;
const IndustrySpec *ind_spc = GetIndustrySpec(it); const IndustrySpec *ind_spc = GetIndustrySpec(it);
byte chance = ind_spc->appear_ingame[_settings_game.game_creation.landscape]; byte chance = ind_spc->appear_ingame[_settings_game.game_creation.landscape];
if (!ind_spc->enabled || chance == 0 || ind_spc->num_table == 0 || if (!ind_spc->enabled || chance == 0 || ind_spc->num_table == 0 ||
@ -2043,49 +2045,59 @@ void Industry::RecomputeProductionMultipliers()
this->production_rate[1] = min(CeilDiv(indspec->production_rate[1] * this->prod_level, PRODLEVEL_DEFAULT), 0xFF); this->production_rate[1] = min(CeilDiv(indspec->production_rate[1] * this->prod_level, PRODLEVEL_DEFAULT), 0xFF);
} }
/** Simple helper that will collect data for the generation of industries */
struct ProbabilityHelper { /**
uint16 prob; ///< probability * Set the #probability field for the industry type \a it for a running game.
IndustryType ind; ///< Industry id. * @param it Industry type.
}; */
void IndustryTypeBuildData::GetIndustryTypeData(IndustryType it)
{
this->probability = GetIndustryGamePlayProbability(it);
}
/** /**
* Try to create a random industry, during gameplay * Try to create a random industry, during gameplay
*/ */
void IndustryBuildData::TryBuildNewIndustry() void IndustryBuildData::TryBuildNewIndustry()
{ {
uint num = 0;
ProbabilityHelper cumulative_probs[NUM_INDUSTRYTYPES]; // probability collector
uint16 probability_max = 0;
/* Generate a list of all possible industries that can be built. */ /* Generate a list of all possible industries that can be built. */
for (IndustryType j = 0; j < NUM_INDUSTRYTYPES; j++) { for (IndustryType j = 0; j < NUM_INDUSTRYTYPES; j++) {
uint16 chance = GetIndustryGamePlayProbability(j); this->builddata[j].GetIndustryTypeData(j);
}
uint count = 0; // Number of industry types eligible for build.
uint32 total_prob = 0; // Sum of probabilities.
for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) {
uint32 chance = this->builddata[it].probability;
if (chance > 0) { if (chance > 0) {
probability_max += chance; total_prob += chance;
/* adds the result for this industry */ count++;
cumulative_probs[num].ind = j;
cumulative_probs[num++].prob = probability_max;
} }
} }
/* Abort if there is no industry buildable */ if (count >= 1) {
if (probability_max == 0) return; /* Pick a weighted random industry to build.
* For the case that count == 1, there is no need to draw a random number. */
/* Find a random type, with maximum being what has been evaluate above*/ IndustryType it;
IndustryType rndtype = RandomRange(probability_max); /* Select an industry type to build (weighted random). */
IndustryType j; uint32 r = 0; // Initialized to silence the compiler.
for (j = 0; j < NUM_INDUSTRYTYPES; j++) { if (count > 1) r = RandomRange(total_prob);
/* and choose the index of the industry that matches as close as possible this random type */ for (it = 0; it < NUM_INDUSTRYTYPES; it++) {
if (cumulative_probs[j].prob >= rndtype) break; uint32 chance = this->builddata[it].probability;
if (chance == 0) continue;
if (count == 1) break;
if (r < chance) break;
r -= chance;
} }
assert(it < NUM_INDUSTRYTYPES);
/* try to create 2000 times this industry */ /* Try to create the industry. */
const Industry *ind = PlaceIndustry(cumulative_probs[j].ind, IACT_RANDOMCREATION, false); const Industry *ind = PlaceIndustry(it, IACT_RANDOMCREATION, false);
if (ind == NULL) return; if (ind != NULL) {
AdvertiseIndustryOpening(ind); AdvertiseIndustryOpening(ind);
} }
}
}
/** /**
* Protects an industry from closure if the appropriate flags and conditions are met * Protects an industry from closure if the appropriate flags and conditions are met