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

update: Reorder feeding, tax & plague for consistency

Browse source 
People in sectors get plagued, then taxed or paid, then fed.  People
on ships and land units get paid, then fed, then plagued.  Sectors
were messed up when Empire 3 made the update code work for budget.

Change sectors back to how they worked before Empire 3: move do_feed()
from produce_sect() to prepare_sects(), and delay do_plague() until
after do_feed().  People in sectors now get taxed, paid and fed even
when they die of the plague, just like they do on ships and land
units.

Because do_plague() now runs after populace(), the latter's handling
of people dying off doesn't cover plague anymore.  Delay it to the
very end of prepare_sects().

Additionally, move feeding and plaguing from upd_ship(), upd_land() to
prep_ship(), prep_land(), for consistency with sectors.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-07-17 10:04:34 +02:00
parent 2fea2a7cb8
commit 43a0a4a451
14 changed files with 1686 additions and 1691 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/update.h
View file

@ -130,6 +130,7 @@ extern void plague_report(natid, int, int, int, int, char *, char *);
extern void prep_planes(int, struct bp *);
extern void prod_plane(int, struct bp *, int);
/* populace.c */
extern void check_pop_loss(struct sctstr *);
extern void populace(struct sctstr *, int);
extern int total_work(int, int, int, int, int, int);
/* prepare.c */