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

update: Drop produce() return value and parameters work, amount

Browse source 
Since changing *sp is safe now, we can move the update of
sp->sct_avail into produce().  This frees the return value; use it to
return the amount produced.  Drop the parameters.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-04 08:12:12 +02:00
parent 688c8b736b
commit 0efa8fa7a1
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/prototypes.h
View file

@ -704,8 +704,7 @@ extern int upd_slmilcosts(natid, int);
extern void prepare_sects(int, struct bp *); extern void prepare_sects(int, struct bp *);
extern int bank_income(struct sctstr *, int); extern int bank_income(struct sctstr *, int);
/* produce.c */ /* produce.c */
extern int produce(struct natstr *, struct sctstr *, int, int, extern int produce(struct natstr *, struct sctstr *, int, int, int *);
int, int *, int *);
extern int prod_materials_cost(struct pchrstr *, short[], int *); extern int prod_materials_cost(struct pchrstr *, short[], int *);
extern int prod_resource_limit(struct pchrstr *, unsigned char *); extern int prod_resource_limit(struct pchrstr *, unsigned char *);
extern double prod_eff(int, float); extern double prod_eff(int, float);

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

@ -45,8 +45,8 @@ static char *levelnames[] = {
}; };
int int
produce(struct natstr *np, struct sctstr *sp, int work, produce(struct natstr *np, struct sctstr *sp,
int desig, int neweff, int *cost, int *amount) int desig, int neweff, int *cost)
{ {
struct pchrstr *product; struct pchrstr *product;
double p_e; double p_e;
@ -69,7 +69,6 @@ produce(struct natstr *np, struct sctstr *sp, int work,
resource = (unsigned char *)sp + product->p_nrndx; resource = (unsigned char *)sp + product->p_nrndx;
else else
resource = NULL; resource = NULL;
*amount = 0;
*cost = 0; *cost = 0;
material_limit = prod_materials_cost(product, sp->sct_item, material_limit = prod_materials_cost(product, sp->sct_item,
@ -86,7 +85,7 @@ produce(struct natstr *np, struct sctstr *sp, int work,
if (unit_work == 0) if (unit_work == 0)
unit_work = 1; unit_work = 1;
worker_limit = work * p_e / unit_work; worker_limit = sp->sct_avail * p_e / unit_work;
res_limit = prod_resource_limit(product, resource); res_limit = prod_resource_limit(product, resource);
material_consume = res_limit; material_consume = res_limit;
@ -150,7 +149,6 @@ produce(struct natstr *np, struct sctstr *sp, int work,
val = 0; val = 0;
*resource = val; *resource = val;
} }
*amount = actual;
*cost = product->p_cost * material_consume; *cost = product->p_cost * material_consume;
if (opt_TECH_POP) { if (opt_TECH_POP) {
@ -161,11 +159,12 @@ produce(struct natstr *np, struct sctstr *sp, int work,
} }
if (CANT_HAPPEN(p_e <= 0.0)) if (CANT_HAPPEN(p_e <= 0.0))
return 0; return actual;
work_used = roundavg(unit_work * material_consume / p_e); work_used = roundavg(unit_work * material_consume / p_e);
if (CANT_HAPPEN(work_used > work)) if (CANT_HAPPEN(work_used > sp->sct_avail))
return work; work_used = sp->sct_avail;
return work_used; sp->sct_avail -= work_used;
return actual;
} }
/* /*

3
src/lib/update/sect.c
View file

@ -328,8 +328,7 @@ produce_sect(struct natstr *np, int etu, struct bp *bp, int p_sect[][2])
if (sp->sct_effic >= 60) { if (sp->sct_effic >= 60) {
if (np->nat_money >= 0 && dchr[desig].d_prd >= 0) if (np->nat_money >= 0 && dchr[desig].d_prd >= 0)
sp->sct_avail -= produce(np, sp, sp->sct_avail, desig, amount = produce(np, sp, desig, sp->sct_effic, &pcost);
sp->sct_effic, &pcost, &amount);
bp_put_items(bp, sp); bp_put_items(bp, sp);
} }