]> git.pond.sub.org Git - empserver/commitdiff
(capi): Do not check capital location if the country
authorRon Koenderink <rkoenderink@yahoo.ca>
Mon, 19 Dec 2005 01:52:13 +0000 (01:52 +0000)
committerRon Koenderink <rkoenderink@yahoo.ca>
Mon, 19 Dec 2005 01:52:13 +0000 (01:52 +0000)
is has NF_SACKED set.

src/lib/commands/capi.c

index 675496cfe8a7bb7c412fda774b29e0d54d18608e..4af7311178b3cd5fb89b594e55ea90cd8e9f9a81 100644 (file)
@@ -61,7 +61,8 @@ capi(void)
     }
     if (!found)
        return RET_FAIL;
-    if (sect.sct_x == np->nat_xcap && sect.sct_y == np->nat_ycap) {
+    if (!(np->nat_flags & NF_SACKED) &&
+       sect.sct_x == np->nat_xcap && sect.sct_y == np->nat_ycap) {
        pr("%s is already your capital.\n",
           xyas(sect.sct_x, sect.sct_y, player->cnum));
        return RET_FAIL;