From 1476e59dceee578d7c7e08a3547cca40f06aea1c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 8 Dec 2007 20:11:33 +0000 Subject: [PATCH] (capi, caploss): Leave updating player->nstat to next status(). --- src/lib/commands/capi.c | 1 - src/lib/subs/caploss.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/commands/capi.c b/src/lib/commands/capi.c index baa315d1..ac1c171a 100644 --- a/src/lib/commands/capi.c +++ b/src/lib/commands/capi.c @@ -61,7 +61,6 @@ capi(void) xyas(sect.sct_x, sect.sct_y, player->cnum)); return RET_FAIL; } - player->nstat |= CAP; np->nat_xcap = sect.sct_x; np->nat_ycap = sect.sct_y; /* They have set a capital, so it wasn't sacked last. */ diff --git a/src/lib/subs/caploss.c b/src/lib/subs/caploss.c index d5566d8a..006a8039 100644 --- a/src/lib/subs/caploss.c +++ b/src/lib/subs/caploss.c @@ -59,10 +59,8 @@ caploss(struct sctstr *sp, natid coun, char *msg) natp = getnatp(coun); if (sp->sct_x != natp->nat_xcap || sp->sct_y != natp->nat_ycap) return; - if (coun == player->cnum) { - player->nstat &= ~CAP; + if (coun == player->cnum) return; - } if (natp->nat_flags & NF_SACKED) return; /* sacked capital, not yet reset */ natp->nat_flags |= NF_SACKED; /* no more sacking until player resets */