From: Pasi Kallinen <paxed@alt.org>
Date: Fri, 15 Jan 2016 11:47:16 +0000 (+0200)
Subject: Fix bz65: Water behaves strangely when hurtling out of air bubble
X-Git-Tag: NetHack-3.6.1_RC01~1018
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c038522b9ddd87979422bfa07ce08d9696066353;p=nethack

Fix bz65: Water behaves strangely when hurtling out of air bubble

When levitating on the plane of water, get an unattached iron ball,
and throw it. You'll hurtle in the opposite direction, out of the air
bubble and into water, but don't drown.
---

diff --git a/src/dothrow.c b/src/dothrow.c
index fa02a1186..f9ee2e374 100644
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -621,6 +621,12 @@ int x, y;
     newsym(ox, oy);    /* update old position */
     vision_recalc(1);  /* update for new position */
     flush_screen(1);
+
+    if (levl[x][y].typ == WATER && Is_waterlevel(&u.uz)) {
+        drown();
+        return FALSE;
+    }
+
     /* FIXME:
      * Each trap should really trigger on the recoil if
      * it would trigger during normal movement. However,