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

(svn r20896) -Codechange: Split recompution of productionrates for non-smooth economy to separate function.

release/1.1
frosch 2010-10-04 19:23:50 +00:00
parent a0a51c2ac1
commit 7f060bdaf5
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/industry.h
View File

@ -65,6 +65,8 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> {
Industry(TileIndex tile = INVALID_TILE) : location(tile, 0, 0) {} Industry(TileIndex tile = INVALID_TILE) : location(tile, 0, 0) {}
~Industry(); ~Industry();
void RecomputeProductionMultipliers();
/** /**
* Get the industry of the given tile * Get the industry of the given tile
* @param tile the tile to get the industry from * @param tile the tile to get the industry from

20
src/industry_cmd.cpp
View File

@ -2030,6 +2030,20 @@ static void UpdateIndustryStatistics(Industry *i)
} }
} }
/**
* Recompute #production_rate for current #prod_level.
* This function is only valid when not using smooth economy.
*/
void Industry::RecomputeProductionMultipliers()
{
const IndustrySpec *indspec = GetIndustrySpec(this->type);
assert(!indspec->UsesSmoothEconomy());
/* Rates are rounded up, so e.g. oilrig always produces some passengers */
this->production_rate[0] = min(CeilDiv(indspec->production_rate[0] * 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 */ /** Simple helper that will collect data for the generation of industries */
struct ProbabilityHelper { struct ProbabilityHelper {
uint16 prob; ///< probability uint16 prob; ///< probability
@ -2371,11 +2385,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly)
/* Recalculate production_rate /* Recalculate production_rate
* For non-smooth economy these should always be synchronized with prod_level */ * For non-smooth economy these should always be synchronized with prod_level */
if (recalculate_multipliers) { if (recalculate_multipliers) i->RecomputeProductionMultipliers();
/* Rates are rounded up, so e.g. oilrig always produces some passengers */
i->production_rate[0] = min(CeilDiv(indspec->production_rate[0] * i->prod_level, PRODLEVEL_DEFAULT), 0xFF);
i->production_rate[1] = min(CeilDiv(indspec->production_rate[1] * i->prod_level, PRODLEVEL_DEFAULT), 0xFF);
}
/* Close if needed and allowed */ /* Close if needed and allowed */
if (closeit && !CheckIndustryCloseDownProtection(i->type)) { if (closeit && !CheckIndustryCloseDownProtection(i->type)) {