]> git.pond.sub.org Git - empserver/commitdiff
(scuttle_tradeships): calculate ally percentage before ally bonus is applied.
authorRon Koenderink <rkoenderink@yahoo.ca>
Sun, 5 Dec 2004 14:14:19 +0000 (14:14 +0000)
committerRon Koenderink <rkoenderink@yahoo.ca>
Sun, 5 Dec 2004 14:14:19 +0000 (14:14 +0000)
Change to match the description in the info page.

src/lib/commands/scut.c

index f8f202d475ab4cbdf402504067cd4b97d2c1c6d5..710466aaa2e62dc5b69208a123f4930321d61243 100644 (file)
@@ -90,8 +90,8 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
        cash *= (((float)sp->shp_effic) / 100.0);
 
        if (sect.sct_own != sp->shp_own) {
-           cash *= (1.0 + trade_ally_bonus);
            ally_cash = cash * trade_ally_cut;
+           cash *= (1.0 + trade_ally_bonus);\r
        }
     }