]> git.pond.sub.org Git - empserver/commitdiff
update: Move sector type test into bank_income()
authorMarkus Armbruster <armbru@pond.sub.org>
Sun, 17 Jul 2016 09:16:42 +0000 (11:16 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 6 Aug 2017 18:09:17 +0000 (20:09 +0200)
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
src/lib/update/prepare.c

index 8930d3dcdff88a22c2885f680659b8d91ceabf0d..909a2b81b1593c213f486ed3a115532f74004b0e 100644 (file)
@@ -81,8 +81,7 @@ prepare_sects(int etu, struct bp *bp)
            populace(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);
        if (!player->simulation)
            do_plague(sp, etu);
@@ -122,6 +121,9 @@ bank_income(struct sctstr *sp, int etu)
 {
     double income;
 
+    if (sp->sct_type != SCT_BANK)
+       return;
+
     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.money += income;