Remove hard-coded differences between highways and bridge heads

[empserver] / src / lib / commands / desi.c

diff --git a/src/lib/commands/desi.c b/src/lib/commands/desi.c
index cee4e2d83ede209cbb811c165dcef1f7d3231ab6..ce14be6152d149df70a531799fcab56f777754fb 100644 (file)
--- a/src/lib/commands/desi.c
+++ b/src/lib/commands/desi.c
@@ -97,7 +97,7 @@ desi(void)
            continue;
        if (sect.sct_type == SCT_SANCT)
            breaksanct++;
-       if ((des == SCT_HARBR || des == SCT_BHEAD) && !sect.sct_coastal) {
+       if (des == SCT_HARBR && !sect.sct_coastal) {
            pr("%s does not border on water.\n",
               xyas(nstr.x, nstr.y, player->cnum));
            if (player->god)
@@ -129,11 +129,8 @@ desi(void)
        if (sect.sct_x == cap_x && sect.sct_y == cap_y
            && 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 */
-           if (n != SCT_BHEAD)
-               continue;
+       if (!opt_EASY_BRIDGES && IS_BRIDGE_HEAD(n))
            bridgefall(&sect);
-       }
     }
     if (changed)
        writemap(player->cnum);