From c96761ecee5a2c272d59fdac8d098751c1fee135 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 8 Dec 2007 07:33:45 +0000 Subject: [PATCH] (status): Simplify. No functional change. --- src/lib/player/player.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/src/lib/player/player.c b/src/lib/player/player.c index 89f63a7d..ff5d5b0b 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -166,34 +166,21 @@ status(void) putnat(natp); return 0; } - if (player->dolcost != 0.0) { - if (player->dolcost > 100.0) - pr("That just cost you $%.2f\n", player->dolcost); - else if (player->dolcost < -100.0) - pr("You just made $%.2f\n", -player->dolcost); - if (natp->nat_money < player->dolcost && !player->broke) { - player->broke = 1; - player->nstat &= ~MONEY; - pr("You are now broke; industries are on strike.\n"); - } else if (player->broke && natp->nat_money - player->dolcost > 0) { - player->broke = 0; - player->nstat |= MONEY; - pr("You are no longer broke!\n"); - } - natp->nat_money -= roundavg(player->dolcost); - player->dolcost = 0.0; - } else { - if (natp->nat_money < 0.0 && !player->broke) { - player->broke = 1; - player->nstat &= ~MONEY; - pr("You are now broke; industries are on strike.\n"); - } - if (player->broke && natp->nat_money > 0) { - player->broke = 0; - player->nstat |= MONEY; - pr("You are no longer broke!\n"); - } + if (player->dolcost > 100.0) + pr("That just cost you $%.2f\n", player->dolcost); + else if (player->dolcost < -100.0) + pr("You just made $%.2f\n", -player->dolcost); + if (natp->nat_money < player->dolcost && !player->broke) { + player->broke = 1; + player->nstat &= ~MONEY; + pr("You are now broke; industries are on strike.\n"); + } else if (player->broke && natp->nat_money - player->dolcost > 0) { + player->broke = 0; + player->nstat |= MONEY; + pr("You are no longer broke!\n"); } + natp->nat_money -= roundavg(player->dolcost); + player->dolcost = 0.0; getsect(natp->nat_xcap, natp->nat_ycap, §); if (influx(natp)) player->nstat &= ~CAP;