(status): Simplify conditional for the "lost your capital" message.

(player): No uses of member visitor left, remove.

diff --git a/include/player.h b/include/player.h
index f0f96163d17aba22d3460e29a4538e15da5d2ffd..ec432e66e376724e2ff41d24da45ed374744d631 100644 (file)
--- a/include/player.h
+++ b/include/player.h
@@ -61,7 +61,6 @@ struct player {
     int ncomstat;
     int minleft;
     int btused;
-    int visitor;
     int god;
     int owner;
     int nstat;

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 309ab4f3fc842c6cb993a9a24cf6479a82f9769b..9f57dbf281abd55433fbcee37cf206e275012f54 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -171,7 +171,6 @@ status(void)
        putnat(natp);
        return 0;
     }
-    player->visitor = natp->nat_stat < STAT_SANCT;
     if (player->dolcost != 0.0) {
        if (player->dolcost > 100.0)
            pr("That just cost you $%.2f\n", player->dolcost);
@@ -256,7 +255,7 @@ status(void)
               numstr(buf, natp->nat_ann));
        natp->nat_ann = 0;
     }
-    if (!player->visitor && !player->god && (player->nstat & CAP) == 0)
+    if (natp->nat_stat == STAT_ACTIVE && (player->nstat & CAP) == 0)
        pr("You lost your capital... better designate one\n");
     putnat(natp);
     if (gamedown() && !player->god) {