]> git.pond.sub.org Git - empserver/commitdiff
Don't warn deities about capital redesignation
authorMarkus Armbruster <armbru@pond.sub.org>
Fri, 2 Jan 2009 08:09:09 +0000 (09:09 +0100)
committerMarkus Armbruster <armbru@pond.sub.org>
Fri, 2 Jan 2009 08:09:09 +0000 (09:09 +0100)
src/lib/commands/desi.c

index c320a7a1bd58d9c01ed0fdf594fc4a529156bd31..6bc0a11cf8c2f0f1a48904c9a10fe77769aaaa75 100644 (file)
@@ -44,8 +44,6 @@ desi(void)
 {
     int n;
     char *p;
-    int cap_x;
-    int cap_y;
     int des;
     struct nstr_sect nstr;
     struct sctstr sect;
@@ -58,8 +56,6 @@ desi(void)
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
     natp = getnatp(player->cnum);
-    cap_x = natp->nat_xcap;
-    cap_y = natp->nat_ycap;
     while (nxtsct(&nstr, &sect)) {
        if (!player->owner)
            continue;
@@ -134,7 +130,8 @@ desi(void)
        }
        sect.sct_newtype = des;
        putsect(&sect);
-       if (sect.sct_x == cap_x && sect.sct_y == cap_y
+       if (!player->god
+           && sect.sct_x == natp->nat_xcap && sect.sct_y == natp->nat_ycap
            && des != SCT_CAPIT && des != SCT_SANCT && des != SCT_MOUNT)
            pr("You have redesignated your capital!\n");
        if (opt_EASY_BRIDGES == 0) {    /* may cause a bridge fall */