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

update: Drop redundant do_feed() 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:03:19 +02:00
parent 51c5c65654
commit 26dc92e1b5
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -664,7 +664,7 @@ extern int dodistribute(struct sctstr *, int, double);
extern void finish_sects(int);
/* human.c */
extern int new_work(struct sctstr *, int);
extern int do_feed(struct sctstr *, struct natstr *, short *, int *, int);
extern int do_feed(struct sctstr *, struct natstr *, int *, int);
extern int feed_people(short *, int);
extern double food_needed(short *, int);
extern int famine_victims(short *, int);

32
src/lib/update/human.c
View file

@ -53,8 +53,7 @@ static int babies(int, int, double, int, int);
* feed the individual sector
*/
int
do_feed(struct sctstr *sp, struct natstr *np, short *vec,
int *workp, int etu)
do_feed(struct sctstr *sp, struct natstr *np, int *workp, int etu)
{
int work_avail;
int starved, sctwork;
@ -65,23 +64,26 @@ do_feed(struct sctstr *sp, struct natstr *np, short *vec,
maxworkers = max_workers(np->nat_level[NAT_RLEV], sp);
work_avail = new_work(sp,
total_work(sp->sct_work, etu,
vec[I_CIVIL], vec[I_MILIT], vec[I_UW],
sp->sct_item[I_CIVIL],
sp->sct_item[I_MILIT],
sp->sct_item[I_UW],
maxworkers));
if (sp->sct_type != SCT_SANCT) {
manna = 0;
if (opt_NOFOOD == 0) {
needed = (int)ceil(food_needed(vec, etu));
if (vec[I_FOOD] < needed) {
needed = (int)ceil(food_needed(sp->sct_item, etu));
if (sp->sct_item[I_FOOD] < needed) {
/* need to grow "emergency rations" */
work_avail -= 2 * growfood(sp, vec, work_avail / 2, etu);
work_avail -= 2 * growfood(sp, sp->sct_item,
work_avail / 2, etu);
/* It's twice as hard to grow those than norm */
if (vec[I_FOOD] == 0)
if (sp->sct_item[I_FOOD] == 0)
/* Conjure up 1f to make life easier for the player */
manna = vec[I_FOOD] = 1;
manna = sp->sct_item[I_FOOD] = 1;
}
}
starved = feed_people(vec, etu);
starved = feed_people(sp->sct_item, etu);
if (starved > 0) {
if (!player->simulation) {
/* don't report POGO starvation */
@ -100,11 +102,13 @@ do_feed(struct sctstr *sp, struct natstr *np, short *vec,
sctwork += 7 + roll(15);
if (sctwork > 100)
sctwork = 100;
grow_people(sp, etu, np, vec);
grow_people(sp, etu, np, sp->sct_item);
work_avail = new_work(sp,
total_work(sp->sct_work, etu,
vec[I_CIVIL], vec[I_MILIT],
vec[I_UW], maxworkers));
sp->sct_item[I_CIVIL],
sp->sct_item[I_MILIT],
sp->sct_item[I_UW],
maxworkers));
/* FIXME restores work charged for growfood() */
/* age che */
if (!player->simulation)
@ -112,11 +116,11 @@ do_feed(struct sctstr *sp, struct natstr *np, short *vec,
}
if (manna)
/* Take away food we conjured up */
vec[I_FOOD] = 0;
sp->sct_item[I_FOOD] = 0;
} else
sctwork = 100;
/* Here is where we truncate extra people, always */
trunc_people(sp, np, vec);
trunc_people(sp, np, sp->sct_item);
*workp = work_avail;
if (!player->simulation)

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

@ -287,7 +287,7 @@ produce_sect(struct natstr *np, int etu, struct bp *bp, int p_sect[][2])
sp->sct_updated = 1;
work = 0;
do_feed(sp, np, sp->sct_item, &work, etu);
do_feed(sp, np, &work, etu);
bp_put_items(bp, sp);
if (sp->sct_off || np->nat_money < 0)