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

update: Lift populace() from tax into prepare_sects()

Browse source 
This way, tax() is more focused, and populace() doesn't need to be
guarded with !player->simulation.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-04 17:56:41 +02:00
parent a6a2e0b5da
commit 1e8d290e57
3 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/commands/budg.c
View file

@ -197,7 +197,7 @@ calc_all(int p_sect[][2],
bp_set_from_sect(bp, sp);
if (sp->sct_own == player->cnum) {
sp->sct_updated = 0;
tax(sp, np, etu, &pop, &civ_tax, &uw_tax, &mil_pay);
tax(sp, etu, &pop, &civ_tax, &uw_tax, &mil_pay);
*Ncivs += sp->sct_item[I_CIVIL];
*Nuws += sp->sct_item[I_UW];
*taxes += civ_tax + uw_tax;