Merge branch 'master' into win32-x64-working

Conflicts:
	src/end.c
	src/files.c
	src/options.c
This commit is contained in:
nhmall
2015-04-25 08:58:59 -04:00
9 changed files with 160 additions and 155 deletions

View File

@@ -114,8 +114,7 @@ const char *goal;
cc.x = cx;
cc.y = cy;
if (do_screen_description(cc, TRUE, sym, tmpbuf, &firstmatch)) {
/* there may be an encoded glyph */
putmixed(WIN_MESSAGE, 0, tmpbuf);
pline1(firstmatch);
curs(WIN_MAP, cx, cy);
flush_screen(0);
}