(nat_cap, status): Use the new function influx() to determine

if a valid capital is present or not.

diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c
index 6422de1f652d1364f95e38b55484c185c7c89404..f50f00ad5fff0bce17b4b57ab84280819fdac642 100644 (file)
--- a/src/lib/player/init_nats.c
+++ b/src/lib/player/init_nats.c
@@ -85,15 +85,10 @@ nat_cap(int btu)
        return -1;
     }
     if ((player->nstat & NORM) == NORM) {
-       if (player->owner && (sect.sct_type == SCT_CAPIT ||
-                             sect.sct_type == SCT_MOUNT ||
-                             sect.sct_type == SCT_SANCT))
-           player->nstat |= CAP;
-       else
+       if (influx(np))
            player->nstat &= ~CAP;
-       /* Ok, has the country owner reset his capital yet after it was sacked? */
-       if (np->nat_flags & NF_SACKED)
-           player->nstat &= ~CAP;      /* No capital yet */
+       else
+           player->nstat |= CAP;
     }
     delta = 0;
     if ((player->nstat & CAP) || player->god) {

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index c119649ba5874dec7f6460ad161f9f130d5e24c5..48e3fb203a64d0afa8c8f484450755114998ac3f 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -214,14 +214,10 @@ status(void)
        }
     }
     getsect(natp->nat_xcap, natp->nat_ycap, &sect);
-    if ((sect.sct_type == SCT_CAPIT || sect.sct_type == SCT_MOUNT ||
-        sect.sct_type == SCT_SANCT) && sect.sct_own == player->cnum)
-       player->nstat |= CAP;
-    else
+    if (influx(natp))
        player->nstat &= ~CAP;
-    /* Ok, has the country owner reset his capital yet after it was sacked? */
-    if (natp->nat_flags & NF_SACKED)
-       player->nstat &= ~CAP;  /* No capital yet */
+    else
+       player->nstat |= CAP;
     player->ncomstat = player->nstat;
     time(&player->curup);
     minute = (player->curup - player->lasttime) / 60;