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

update: Move sector type test into bank_income()

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-07-17 11:16:42 +02:00
parent 9a2e1ccd6c
commit 10c131549e
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/lib/update/prepare.c
View file

@ -81,8 +81,7 @@ prepare_sects(int etu, struct bp *bp)
populace(sp, etu); populace(sp, etu);
} }
tax(sp, etu); tax(sp, etu);
if (sp->sct_type == SCT_BANK) bank_income(sp, etu);
bank_income(sp, etu);
do_feed(sp, getnatp(sp->sct_own), etu, 0); do_feed(sp, getnatp(sp->sct_own), etu, 0);
if (!player->simulation) if (!player->simulation)
do_plague(sp, etu); do_plague(sp, etu);
@ -122,6 +121,9 @@ bank_income(struct sctstr *sp, int etu)
{ {
double income; double income;
if (sp->sct_type != SCT_BANK)
return;
income = sp->sct_item[I_BAR] * etu * bankint * sp->sct_effic / 100; income = sp->sct_item[I_BAR] * etu * bankint * sp->sct_effic / 100;
nat_budget[sp->sct_own].bars.count += sp->sct_item[I_BAR]; nat_budget[sp->sct_own].bars.count += sp->sct_item[I_BAR];
nat_budget[sp->sct_own].bars.money += income; nat_budget[sp->sct_own].bars.money += income;