(caploss): Simplify. No functional change.
This commit is contained in:
parent
a46c7656d2
commit
707e4fda95
1 changed files with 4 additions and 6 deletions
|
@ -57,23 +57,21 @@ caploss(struct sctstr *sp, natid coun, char *msg)
|
||||||
if (coun == 0)
|
if (coun == 0)
|
||||||
return;
|
return;
|
||||||
natp = getnatp(coun);
|
natp = getnatp(coun);
|
||||||
if ((xrel(natp, natp->nat_xcap) != xrel(natp, sp->sct_x)) ||
|
if (sp->sct_x != natp->nat_xcap || sp->sct_y != natp->nat_ycap)
|
||||||
(yrel(natp, natp->nat_ycap) != yrel(natp, sp->sct_y)))
|
|
||||||
return;
|
return;
|
||||||
if (coun == player->cnum) {
|
if (coun == player->cnum) {
|
||||||
player->nstat &= ~CAP;
|
player->nstat &= ~CAP;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* Ok, has the country owner reset their capital yet after it was last sacked? */
|
|
||||||
if (natp->nat_flags & NF_SACKED)
|
if (natp->nat_flags & NF_SACKED)
|
||||||
return; /* No, so not really the capital yet, so return */
|
return; /* sacked capital, not yet reset */
|
||||||
|
natp->nat_flags |= NF_SACKED; /* no more sacking until player resets */
|
||||||
|
|
||||||
pr(msg, natp->nat_cnam);
|
pr(msg, natp->nat_cnam);
|
||||||
gain = lose = natp->nat_money / 2;
|
gain = lose = natp->nat_money / 2;
|
||||||
if (lose < 3000)
|
if (lose < 3000)
|
||||||
lose = 3000;
|
lose = 3000;
|
||||||
natp->nat_money -= lose;
|
natp->nat_money -= lose;
|
||||||
/* Your capital has now been sacked, no more sacking until you reset it */
|
|
||||||
natp->nat_flags |= NF_SACKED;
|
|
||||||
putnat(natp);
|
putnat(natp);
|
||||||
wu(0, coun, "* %s just sacked your capital! *\n", cname(player->cnum));
|
wu(0, coun, "* %s just sacked your capital! *\n", cname(player->cnum));
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue