From: Pasi Kallinen <paxed@alt.org>
Date: Sat, 28 Mar 2015 17:31:01 +0000 (+0200)
Subject: YAFMs when trying to pick up terrain features
X-Git-Tag: NetHack-3.6.0_RC01~526
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbb155b0e67afa9c1c78bd9717a3cb1a9eefe1fd;p=nethack

YAFMs when trying to pick up terrain features
---

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 2db942ec5..f2e1b2890 100644
--- 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 7f15af6ee..98e615ac8 100644
--- 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)) {