Merge branch 'master' into win32-x64-working

* master: (354 commits)
  Add missing protos
  a warning bout lc_error
  Add S_poisoncloud to Guidebooks
  ...

Conflicts:
	.gitattributes
	dat/.gitattributes
	doc/.gitattributes
	doc/Guidebook.mn
	include/config.h
	include/decl.h
	include/extern.h
	include/flag.h
	include/hack.h
	include/ntconf.h
	include/sys.h
	include/wceconf.h
	src/apply.c
	src/attrib.c
	src/bones.c
	src/botl.c
	src/dbridge.c
	src/dig.c
	src/do.c
	src/do_name.c
	src/dog.c
	src/dungeon.c
	src/eat.c
	src/end.c
	src/files.c
	src/fountain.c
	src/hack.c
	src/invent.c
	src/light.c
	src/makemon.c
	src/mhitu.c
	src/mklev.c
	src/mkmaze.c
	src/mkobj.c
	src/mkroom.c
	src/mon.c
	src/objnam.c
	src/options.c
	src/pager.c
	src/pickup.c
	src/potion.c
	src/pray.c
	src/questpgr.c
	src/read.c
	src/restore.c
	src/rnd.c
	src/role.c
	src/rumors.c
	src/save.c
	src/shk.c
	src/sit.c
	src/sp_lev.c
	src/sys.c
	src/teleport.c
	src/trap.c
	src/u_init.c
	src/uhitm.c
	src/wield.c
	src/worn.c
	src/zap.c
	sys/amiga/.gitattributes
	sys/mac/.gitattributes
	sys/msdos/.gitattributes
	sys/msdos/pctiles.c
	sys/msdos/vidvga.c
	sys/os2/.gitattributes
	sys/share/.gitattributes
	sys/share/pcmain.c
	sys/unix/.gitattributes
	sys/unix/hints/.gitattributes
	sys/unix/sysconf
	sys/unix/unixmain.c
	sys/vms/.gitattributes
	sys/wince/.gitattributes
	sys/wince/mhstatus.c
	sys/winnt/.gitattributes
	sys/winnt/Makefile.msc
	sys/winnt/nhsetup.bat
	util/lev_comp.l
	util/makedefs.c
	win/X11/winmenu.c
	win/X11/winstat.c
	win/gnome/gnstatus.c
	win/share/tilemap.c
	win/tty/termcap.c
	win/tty/topl.c
	win/tty/wintty.c

src/hack.c

@@ -630,8 +630,11 @@ int mode;
 	if (Passes_walls && may_passwall(x,y)) {
 	    ;	/* do nothing */
 	} else if (tmpr->typ == IRONBARS) {
-	    if (!(Passes_walls || passes_bars(youmonst.data)))
+	    if (!(Passes_walls || passes_bars(youmonst.data))) {
+		if (iflags.mention_walls)
+		    You("cannot pass through the bars.");
 		return FALSE;
+	    }
 	} else if (tunnels(youmonst.data) && !needspick(youmonst.data)) {
 	    /* Eat the rock. */
 	    if (mode == DO_MOVE && still_chewing(x,y)) return FALSE;
@@ -646,8 +649,10 @@ int mode;
 		if (Is_stronghold(&u.uz) && is_db_wall(x,y))
 		    pline_The("drawbridge is up!");
 		/* sokoban restriction stays even after puzzle is solved */
-		if (Passes_walls && !may_passwall(x,y) && In_sokoban(&u.uz))
+		else if (Passes_walls && !may_passwall(x,y) && In_sokoban(&u.uz))
 		    pline_The("Sokoban walls resist your ability.");
+		else if (iflags.mention_walls)
+		    pline("It's a wall.");
 	    }
 	    return FALSE;
 	}
@@ -1563,6 +1568,7 @@ domove()
 	/* must come after we finished picking up, in spoteffects() */
 	if (cause_delay) {
 	    nomul(-2);
+	    multi_reason = "dragging an iron ball";
 	    nomovemsg = "";
 	}
 
@@ -2202,7 +2208,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)) {
@@ -2417,6 +2435,7 @@ nomul(nval)
 	u.uinvulnerable = FALSE;	/* Kludge to avoid ctrl-C bug -dlc */
 	u.usleep = 0;
 	multi = nval;
+	if (nval == 0) multi_reason = NULL;
 	context.travel = context.travel1 = context.mv = context.run = 0;
 }
 
@@ -2431,6 +2450,7 @@ const char *msg_override;
 	if (*nomovemsg) pline1(nomovemsg);
 	nomovemsg = 0;
 	u.usleep = 0;
+	multi_reason = NULL;
 	if (afternmv) (*afternmv)();
 	afternmv = 0;
 }