(player_set_nstat): New, factored out of init_nats().

(init_nats): Use it.  No functional change.

(status): Use it.  This sets player->nstat from scratch, not just
MONEY and CAP.
(brea): Don't bother to update player->nstat, status() will.

diff --git a/include/prototypes.h b/include/prototypes.h
index 3c1d3d637f60c45459cc61ab0ada94450b5588d8..02671c9d9c7e9e6f47dc6b1fc3ba3492b46e61fc 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -411,6 +411,7 @@ extern int getminleft(time_t, int);
 /* empmod.c */
 /* init_nats.c */
 extern int init_nats(void);
+extern int player_set_nstat(struct player *, struct natstr *);
 /* login.c */
 extern void player_login(void *);
 /* nat.c */

diff --git a/src/lib/commands/brea.c b/src/lib/commands/brea.c
index 07723d46e9d61342866bbf3df35bf19ff0fcd46c..081f8057a77fd6311fc1bd46ce193a83d2a26265 100644 (file)
--- a/src/lib/commands/brea.c
+++ b/src/lib/commands/brea.c
@@ -48,6 +48,5 @@ brea(void)
     bsanct();
     natp->nat_stat = STAT_ACTIVE;
     putnat(natp);
-    player->nstat |= NORM;
     return RET_OK;
 }

diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c
index 9674153f20234bd426e174e43253cd08c239e0bb..d522c27c34b548f273ecc2c3ca0e0c25956a48b2 100644 (file)
--- a/src/lib/player/init_nats.c
+++ b/src/lib/player/init_nats.c
@@ -47,30 +47,41 @@
 int
 init_nats(void)
 {
-    static int nstat[] = {
-       /* must match nat_status */
-       0, VIS, VIS, SANCT, NORM, GOD
-    };
     struct natstr *np;
 
     np = getnatp(player->cnum);
     if (CANT_HAPPEN(!np))
        return -1;
-    player->nstat = nstat[np->nat_stat];
-    player->god = np->nat_stat == STAT_GOD;
+
     player->map = ef_ptr(EF_MAP, player->cnum);
     player->bmap = ef_ptr(EF_BMAP, player->cnum);
-    if (opt_HIDDEN) {
+
+    if (opt_HIDDEN)
        putcontact(np, player->cnum, FOUND_SPY);
-    }
-    if (np->nat_money < 0)
-       player->broke = 1;
-    else {
-       player->nstat |= MONEY;
-       player->broke = 0;
-    }
-    if (grant_btus(np, game_tick_to_now(&np->nat_access)))
-       player->nstat |= CAP;
+
+    player_set_nstat(player, np);
+    grant_btus(np, game_tick_to_now(&np->nat_access));
+
     putnat(np);
     return 0;
 }
+
+int
+player_set_nstat(struct player *pl, struct natstr *np)
+{
+    static int nstat[] = {
+       /* must match nat_status */
+       0, VIS, VIS, SANCT, NORM, GOD
+    };
+
+    if (CANT_HAPPEN(pl->cnum != np->nat_cnum))
+       return pl->nstat;
+    pl->god = np->nat_stat == STAT_GOD;
+    pl->nstat = nstat[np->nat_stat];
+    pl->broke = np->nat_money < 0;
+    if (!pl->broke)
+       pl->nstat |= MONEY;
+    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 054c13ef13c4f6d2f9a7ae105b5c51c5d36a8380..52a7e2bab6f5f2540ec1ed12f51570851c902aec 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -46,7 +46,6 @@
 #include "player.h"
 #include "proto.h"
 #include "prototypes.h"
-#include "sect.h"
 #include "tel.h"
 
 
@@ -156,7 +155,6 @@ status(void)
 {
     struct natstr *natp;
     int minute;
-    struct sctstr sect;
     char buf[128];
 
     if (player->state == PS_SHUTDOWN)
@@ -172,23 +170,17 @@ status(void)
        pr("You just made $%.2f\n", -player->dolcost);
     natp->nat_money -= roundavg(player->dolcost);
     player->dolcost = 0.0;
+
     if (natp->nat_money < 0 && !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 >= 0) {
-       player->broke = 0;
-       player->nstat |= MONEY;
        pr("You are no longer broke!\n");
     }
-    getsect(natp->nat_xcap, natp->nat_ycap, &sect);
-    if (influx(natp))
-       player->nstat &= ~CAP;
-    else
-       player->nstat |= CAP;
+    player_set_nstat(player, natp);
     player->ncomstat = player->nstat;
     if (player->god)
        player->ncomstat |= CAP | MONEY;
+
     time(&player->curup);
     minute = (player->curup - player->lasttime) / 60;
     if (minute > 0) {