From d3eec3e09da678c3b6500868ee13e1cad4e2b019 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 8 Dec 2007 20:53:08 +0000 Subject: [PATCH] (status, init_nats): Concentrate CAP and MONEY logic in player_set_nstat(). --- src/lib/player/init_nats.c | 4 ++-- src/lib/player/player.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c index bb27b1fd..239eaa74 100644 --- a/src/lib/player/init_nats.c +++ b/src/lib/player/init_nats.c @@ -71,7 +71,7 @@ player_set_nstat(struct player *pl, struct natstr *np) { static int nstat[] = { /* must match nat_status */ - 0, VIS, VIS, SANCT, NORM, GOD + 0, VIS, VIS, SANCT, NORM, GOD | CAP | MONEY }; if (CANT_HAPPEN(pl->cnum != np->nat_cnum)) @@ -80,7 +80,7 @@ player_set_nstat(struct player *pl, struct natstr *np) pl->nstat = nstat[np->nat_stat]; if (np->nat_money >= 0) pl->nstat |= MONEY; - if (np->nat_stat >= STAT_ACTIVE && !influx(np)) + if (np->nat_stat == STAT_ACTIVE && !influx(np)) pl->nstat |= CAP; return pl->nstat; } diff --git a/src/lib/player/player.c b/src/lib/player/player.c index 43249fdd..70ea2fe7 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -173,8 +173,6 @@ status(void) old_nstat = player->nstat; player_set_nstat(player, natp); - if (player->god) - player->nstat |= CAP | MONEY; if ((old_nstat & MONEY) && !(player->nstat & MONEY)) pr("You are now broke; industries are on strike.\n"); if (!(old_nstat & MONEY) && (player->nstat & MONEY))