Merge branch 'NetHack-3.6.0'

2016-06-21 10:29:14 -04:00
parent f48fcf7a9d d015cbec15
commit 8ff16b07c1
84 changed files with 3167 additions and 1281 deletions
--- a/src/mkmaze.c
+++ b/src/mkmaze.c
@@ -1327,7 +1327,7 @@ xchar x, y;
        ltyp = db_under_typ(lev->drawbridgemask);

    if (ltyp == LAVAPOOL)
-        return "lava";
+        return hliquid("lava");
    else if (ltyp == ICE)
        return "ice";
    else if (ltyp == POOL)
@@ -1339,7 +1339,7 @@ xchar x, y;
    else if (ltyp == MOAT && !Is_medusa_level(&u.uz))
        return "moat";

-    return "water";
+    return hliquid("water");
 }

 STATIC_OVL void