YAFMs when trying to pick up terrain features

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 2db942ec51d508f413c2be16735c585f3dd0fe55..f2e1b2890c3e72f1c5447c3346a690b0beb17fa5 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -888,6 +888,7 @@ show object symbols in menu headings in menus where those object symbols
 show t-shirt text at end of game inventory disclose
 hitting with a polearm remembers the position of the last monster you hit
 allow showing legal polearm positions when asked for location to hit
+add messages for trying to pick up some terrain features
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/hack.c b/src/hack.c
index 7f15af6eeaff611a7ed095e504cea7b4722592cd..98e615ac88a753e4a51f1cc202b48f94eb80cc8c 100644 (file)
--- a/src/hack.c
+++ b/src/hack.c
@@ -2207,7 +2207,19 @@ dopickup()
            }
        }
        if (!OBJ_AT(u.ux, u.uy)) {
-           There("is nothing here to pick up.");
+           register struct rm *lev = &levl[u.ux][u.uy];
+           if (IS_THRONE(lev->typ))
+               pline("It must weigh%s a ton!",
+                     lev->looted ? " almost" : "");
+           else if (IS_SINK(lev->typ))
+               pline_The("plumbing connects it to the floor.");
+           else if (IS_GRAVE(lev->typ))
+               You("don't need a gravestone.  Yet.");
+           else if (IS_FOUNTAIN(lev->typ))
+               You("could drink the water...");
+           else if (IS_DOOR(lev->typ) && (lev->doormask & D_ISOPEN))
+               pline("It won't come off the hinges.");
+           else There("is nothing here to pick up.");
            return 0;
        }
        if (!can_reach_floor(TRUE)) {