From: Markus Armbruster Date: Sun, 2 Oct 2005 10:15:59 +0000 (+0000) Subject: (prod_land, prod_ship): Simplify. X-Git-Tag: v4.2.22~40 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=745bdf7fd16b02bd69c44046b1e50851f0ae116e (prod_land, prod_ship): Simplify. --- diff --git a/src/lib/update/land.c b/src/lib/update/land.c index 3614918fc..291fe5f41 100644 --- a/src/lib/update/land.c +++ b/src/lib/update/land.c @@ -97,7 +97,7 @@ prod_land(int etus, int natnum, int *bp, int build) start_money = np->nat_money; upd_land(lp, etus, np, bp, build); lnd_money[lp->lnd_own] += np->nat_money - start_money; - if ((build && (np->nat_money != start_money)) || (!build)) + if (!build || np->nat_money != start_money) k++; if (player->simulation) np->nat_money = start_money; diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c index cc7ffbbac..930765bfb 100644 --- a/src/lib/update/ship.c +++ b/src/lib/update/ship.c @@ -93,7 +93,7 @@ prod_ship(int etus, int natnum, int *bp, int build) if (build && !player->simulation) /* make sure to only autonav once */ nav_ship(sp); /* autonav the ship */ sea_money[sp->shp_own] += np->nat_money - start_money; - if ((build && (np->nat_money != start_money)) || (!build)) + if (!build || np->nat_money != start_money) k++; if (player->simulation) np->nat_money = start_money;