moat vs water

Far-look and getpos's autodescribe feedback described the castle moat
as "water" and Juiblex's swamp similarly.  Describe them as "moat"
and as "swamp" instead.

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 91115ec732d00d740aea4922bddb47f9f6b97f65..f59d6766782aaccdb1aa4d43fc85079cf0ecf0bb 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.144 $ $NHDT-Date: 1585361048 2020/03/28 02:04:08 $
+$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.148 $ $NHDT-Date: 1585776162 2020/04/01 21:22:42 $
 
 General Fixes and Modified Features
 -----------------------------------
@@ -98,6 +98,8 @@ prevent swallowing monster ending up in a solid wall if it killed vault guard
 fix attached ball getting deallocated if swallowed, going down into a pit,
        and saving
 level compiler creates correct novel with supplied name
+for farlook, describe water in the castle moat and in Juiblex's swamp as moat
+       and as swamp, respectively, rather than just as "water"
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

diff --git a/src/pager.c b/src/pager.c
index f4b904443701265078462c6d21c6b2470e164993..72ebd2807c0e82971d02c066f0375bd78ab847f6 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 pager.c $NHDT-Date: 1578764034 2020/01/11 17:33:54 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.183 $ */
+/* NetHack 3.6 pager.c $NHDT-Date: 1585776162 2020/04/01 21:22:42 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.186 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2018. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -521,6 +521,9 @@ char *buf, *monbuf;
             Strcpy(buf,
                    Is_airlevel(&u.uz) ? "cloudy area" : "fog/vapor cloud");
             break;
+        case S_pool:
+            Strcpy(buf, waterbody_name(x, y));
+            break;
         case S_stone:
             if (!levl[x][y].seenv) {
                 Strcpy(buf, "unexplored");