diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c index 6422de1f..f50f00ad 100644 --- 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 c119649b..48e3fb20 100644 --- 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, §); - 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;