empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(produce): Fix consumed materials when production hits the 999 limit.

Browse source 
This can't happen currently, because produce() never gets called with
work>999.

(produce): Fix rounding of consumed materials on production backlog.
Broken by the previous revision.
This commit is contained in:
Markus Armbruster 2004-03-16 19:25:13 +00:00
parent 9b7a65b865
commit 02d380d74f
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/lib/update/produce.c
View file

@ -135,17 +135,16 @@ produce(struct natstr *np, struct sctstr *sp, short *vec, int work,
actual = *resource * 100 / product->p_nrdep; actual = *resource * 100 / product->p_nrdep;
} }
if (actual > 999) { if (actual > 999) {
material_consume = roundavg(999.0 * material_consume / actual);
actual = 999; actual = 999;
material_consume = (int)(actual / (product->p_effic * 0.01));
} }
if (vec[item] + actual > ITEM_MAX) { if (vec[item] + actual > ITEM_MAX) {
material_consume = material_consume = roundavg((double)(ITEM_MAX - vec[item])
roundavg((ITEM_MAX - vec[item]) * material_consume / actual); * material_consume / actual);
if (material_consume < 0) if (material_consume < 0)
material_consume = 0; material_consume = 0;
vec[item] = ITEM_MAX; vec[item] = ITEM_MAX;
if (( /* vtype != V_FOOD && */ sp->sct_own) && if (sp->sct_own && !player->simulation)
(!player->simulation))
wu(0, sp->sct_own, wu(0, sp->sct_own,
"%s production backlog in %s\n", "%s production backlog in %s\n",
product->p_name, ownxy(sp)); product->p_name, ownxy(sp));