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

update: Drop redundant produce() parameters desig, neweff

Browse source 
Its caller passes sp->sct_type and sp->sct_effic, so use that.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-04 08:56:57 +02:00
parent a60919041d
commit 43fc32a365
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -704,7 +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, int *); extern int produce(struct natstr *, struct sctstr *, 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);

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

@ -45,8 +45,7 @@ static char *levelnames[] = {
}; };
int int
produce(struct natstr *np, struct sctstr *sp, produce(struct natstr *np, struct sctstr *sp, int *cost)
int desig, int neweff, int *cost)
{ {
struct pchrstr *product; struct pchrstr *product;
double p_e; double p_e;
@ -61,9 +60,9 @@ produce(struct natstr *np, struct sctstr *sp,
int material_consume; int material_consume;
int val; int val;
if (dchr[desig].d_prd < 0) if (dchr[sp->sct_type].d_prd < 0)
return 0; return 0;
product = &pchr[dchr[desig].d_prd]; product = &pchr[dchr[sp->sct_type].d_prd];
item = product->p_type; item = product->p_type;
if (product->p_nrndx) if (product->p_nrndx)
resource = (unsigned char *)sp + product->p_nrndx; resource = (unsigned char *)sp + product->p_nrndx;
@ -77,7 +76,7 @@ produce(struct natstr *np, struct sctstr *sp,
return 0; return 0;
/* sector p.e. */ /* sector p.e. */
p_e = neweff / 100.0; p_e = sp->sct_effic / 100.0;
if (resource) { if (resource) {
unit_work++; unit_work++;
p_e *= *resource / 100.0; p_e *= *resource / 100.0;
@ -96,7 +95,7 @@ produce(struct natstr *np, struct sctstr *sp,
if (material_consume == 0) if (material_consume == 0)
return 0; return 0;
prodeff = prod_eff(desig, np->nat_level[product->p_nlndx]); prodeff = prod_eff(sp->sct_type, np->nat_level[product->p_nlndx]);
if (prodeff <= 0.0 && !player->simulation) { if (prodeff <= 0.0 && !player->simulation) {
wu(0, sp->sct_own, wu(0, sp->sct_own,
"%s level too low to produce in %s (need %d)\n", "%s level too low to produce in %s (need %d)\n",

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

@ -327,7 +327,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[sp->sct_type].d_prd >= 0) if (np->nat_money >= 0 && dchr[sp->sct_type].d_prd >= 0)
amount = produce(np, sp, sp->sct_type, sp->sct_effic, &pcost); amount = produce(np, sp, &pcost);
bp_put_items(bp, sp); bp_put_items(bp, sp);
} }