Merge branch 'master' into win32-x64-working

2015-04-18 15:33:50 -04:00
parent 80ad338a9f 78b012a680
commit e5058c9a24
3 changed files with 35 additions and 2 deletions
--- a/src/hack.c
+++ b/src/hack.c
@@ -1363,7 +1363,7 @@ domove()

        if (boulder)
            Strcpy(buf, ansimpleoname(boulder));
-        else if (solid)
+        else if (solid && glyph_is_cmap(glyph))
            Strcpy(buf, the(defsyms[glyph_to_cmap(glyph)].explanation));
        else if (!Underwater)
            Strcpy(buf, "thin air");