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

update: Drop redundant upd_buildeff() parameter vec[]

Browse source 
Its caller passes sp->sct_item, so use that.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-03 21:14:49 +02:00
parent dc6799ebd5
commit 157892b449
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,8 +50,7 @@
* Return amount of work used. * Return amount of work used.
*/ */
static int static int
upd_buildeff(struct sctstr *sp, int *workp, short vec[], int *desig, upd_buildeff(struct sctstr *sp, int *workp, int *desig, int *cost)
int *cost)
{ {
int work_cost = 0; int work_cost = 0;
int buildeff_work = *workp / 2; int buildeff_work = *workp / 2;
@ -83,13 +82,13 @@ upd_buildeff(struct sctstr *sp, int *workp, short vec[], int *desig,
work_cost = buildeff_work; work_cost = buildeff_work;
if (dchr[*desig].d_lcms > 0) { if (dchr[*desig].d_lcms > 0) {
lcms = vec[I_LCM]; lcms = sp->sct_item[I_LCM];
lcms /= dchr[*desig].d_lcms; lcms /= dchr[*desig].d_lcms;
if (work_cost > lcms) if (work_cost > lcms)
work_cost = lcms; work_cost = lcms;
} }
if (dchr[*desig].d_hcms > 0) { if (dchr[*desig].d_hcms > 0) {
hcms = vec[I_HCM]; hcms = sp->sct_item[I_HCM];
hcms /= dchr[*desig].d_hcms; hcms /= dchr[*desig].d_hcms;
if (work_cost > hcms) if (work_cost > hcms)
work_cost = hcms; work_cost = hcms;
@ -100,8 +99,8 @@ upd_buildeff(struct sctstr *sp, int *workp, short vec[], int *desig,
buildeff_work -= work_cost; buildeff_work -= work_cost;
if ((dchr[*desig].d_lcms > 0) || (dchr[*desig].d_hcms > 0)) { if ((dchr[*desig].d_lcms > 0) || (dchr[*desig].d_hcms > 0)) {
vec[I_LCM] -= work_cost * dchr[*desig].d_lcms; sp->sct_item[I_LCM] -= work_cost * dchr[*desig].d_lcms;
vec[I_HCM] -= work_cost * dchr[*desig].d_hcms; sp->sct_item[I_HCM] -= work_cost * dchr[*desig].d_hcms;
} }
} }
*workp = (*workp + 1) / 2 + buildeff_work; *workp = (*workp + 1) / 2 + buildeff_work;
@ -309,7 +308,7 @@ produce_sect(struct natstr *np, int etu, struct bp *bp, int p_sect[][2])
if ((sp->sct_effic < 100 || sp->sct_type != sp->sct_newtype) && if ((sp->sct_effic < 100 || sp->sct_type != sp->sct_newtype) &&
np->nat_money >= 0) { np->nat_money >= 0) {
neweff = upd_buildeff(sp, &work, sp->sct_item, &desig, &cost); neweff = upd_buildeff(sp, &work, &desig, &cost);
bp_put_items(bp, sp); bp_put_items(bp, sp);
p_sect[SCT_EFFIC][0]++; p_sect[SCT_EFFIC][0]++;
p_sect[SCT_EFFIC][1] += cost; p_sect[SCT_EFFIC][1] += cost;