]> granicus.if.org Git - nethack/commitdiff
bz24: Wrong floor descriptions on Planes when levitating and going down
authorPasi Kallinen <paxed@alt.org>
Fri, 15 Jan 2016 11:15:09 +0000 (13:15 +0200)
committerPasi Kallinen <paxed@alt.org>
Fri, 15 Jan 2016 11:15:13 +0000 (13:15 +0200)
src/do.c

index c5030f73a94a6f4eeff659dc475ce48b66d1fb50..bab6f04a374091b0344b6a3e4447fb45c340abc7 100644 (file)
--- a/src/do.c
+++ b/src/do.c
@@ -919,7 +919,13 @@ dodown()
                 ladder_down =
                     (glyph_to_cmap(levl[u.ux][u.uy].glyph) == S_dnladder);
         }
-        floating_above(stairs_down ? "stairs" : ladder_down
+        if (Is_airlevel(&u.uz))
+            You("are floating in the %s.", surface(u.ux, u.uy));
+        else if (Is_waterlevel(&u.uz))
+            You("are floating in %s.",
+                is_pool(u.ux, u.uy) ? "the water" : "a bubble of air");
+        else
+            floating_above(stairs_down ? "stairs" : ladder_down
                                                     ? "ladder"
                                                     : surface(u.ux, u.uy));
         return 0; /* didn't move */