build: Reword bridge next to land messages to mention the sector

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c
index fb183a4a79258b4d0e935559980904dded748925..9495565e9e7c5d1970936c6869a50dd543b70e64 100644 (file)
--- a/src/lib/commands/buil.c
+++ b/src/lib/commands/buil.c
@@ -525,8 +525,8 @@ build_bspan(struct sctstr *sp)
     }
     if (!bridge_support_at(&sect, DIR_STOP)) {
        if (opt_EASY_BRIDGES) {
-           pr("Bridges must be built adjacent to land or bridge towers.\n");
-           pr("That sector is not adjacent to land or a bridge tower.\n");
+           pr("%s is not next to land or a bridge tower",
+              xyas(newx, newy, player->cnum));
        } else {
            /*
             * Note: because players need a 60% bridge head or tower,
@@ -619,8 +619,8 @@ build_btower(struct sctstr *sp)
        getsect(nx, ny, &s2);
        if ((s2.sct_type != SCT_WATER) &&
            (s2.sct_type != SCT_BTOWER) && (s2.sct_type != SCT_BSPAN)) {
-           pr("Bridge towers cannot be built adjacent to land.\n");
-           pr("That sector is adjacent to land.\n");
+           pr("%s is next to land, can't build bridge tower there",
+              xyas(newx, newy, player->cnum));
            return 0;
        }
     }

diff --git a/tests/build/journal.log b/tests/build/journal.log
index c6b771a2853bddd061f6ecf150c4f27076d3c8c6..2138d947fbdaef6c2092e902faf6777651bff48d 100644 (file)
--- a/tests/build/journal.log
+++ b/tests/build/journal.log
@@ -906,8 +906,7 @@
     Play#5 output Play#5 6 0 632
     Play#5 input build b -4,4 b
     Play#5 command build
-    Play#5 output Play#5 1 Bridges must be built adjacent to land or bridge towers.
-    Play#5 output Play#5 1 That sector is not adjacent to land or a bridge tower.
+    Play#5 output Play#5 1 -5,5 is not next to land or a bridge tower
     Play#5 output Play#5 6 0 631
     Play#5 input build b
     Play#5 command build
@@ -1059,8 +1058,7 @@
     Play#9 output Play#9 6 0 632
     Play#9 input build t -6,-4 j
     Play#9 command build
-    Play#9 output Play#9 1 Bridge towers cannot be built adjacent to land.
-    Play#9 output Play#9 1 That sector is adjacent to land.
+    Play#9 output Play#9 1 -4,-4 is next to land, can't build bridge tower there
     Play#9 output Play#9 6 0 631
     Play#9 input build t
     Play#9 command build
@@ -1137,8 +1135,7 @@
     Play#0 output Play#0 6 0 639
     Play#0 input build b -8,2 u
     Play#0 command build
-    Play#0 output Play#0 1 Bridges must be built adjacent to land or bridge towers.
-    Play#0 output Play#0 1 That sector is not adjacent to land or a bridge tower.
+    Play#0 output Play#0 1 -7,1 is not next to land or a bridge tower
     Play#0 output Play#0 6 0 638
     Play#0 input build b -8,2 j
     Play#0 command build