]> git.pond.sub.org Git - empserver/commitdiff
(capi, caploss): Leave updating player->nstat to next status().
authorMarkus Armbruster <armbru@pond.sub.org>
Sat, 8 Dec 2007 20:11:33 +0000 (20:11 +0000)
committerMarkus Armbruster <armbru@pond.sub.org>
Sat, 8 Dec 2007 20:11:33 +0000 (20:11 +0000)
src/lib/commands/capi.c
src/lib/subs/caploss.c

index baa315d1d7f79e97e1dfa06caba2cbf9c3c87015..ac1c171a7806c4b1cf4dfd13bdb9d7c8a94f357f 100644 (file)
@@ -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. */
index d5566d8a254245c74aeb6af21f5d4dea90ad214f..006a80393c1122c18a536932786dec0cdfaecb97 100644 (file)
@@ -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 */