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

update: Track oldowned civilians in nat_budget[]

Browse source 
Replace pops[] by nat_budget[].oldowned_civs.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-19 12:31:16 +02:00
parent 4a714a37da
commit 6eb4fd3cbf
6 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -145,7 +145,6 @@ calc_all(void)
struct budget *budget = &nat_budget[player->cnum];
struct natstr *np;
struct bp *bp;
int pop = 0;
int n;
struct sctstr *sp;
int etu = etu_per_update;
@ -159,12 +158,12 @@ calc_all(void)
bp_set_from_sect(bp, sp);
if (sp->sct_own == player->cnum) {
sp->sct_updated = 0;
tax(sp, etu, &pop);
tax(sp, etu);
if (sp->sct_type == SCT_BANK)
bank_income(sp, etu);
}
}
tpops[player->cnum] = pop;
tpops[player->cnum] = budget->oldowned_civs;
upd_slmilcosts(etu, player->cnum);
pay_reserve(np, etu);