empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
if a valid capital is present or not.
This commit is contained in:
Ron Koenderink 2005-12-23 01:10:07 +00:00
parent 7b507bd1d5
commit 9b3e820d3a
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/lib/player/init_nats.c
View file

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

10
src/lib/player/player.c
View file

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