From: Michael Meyer <me@entrez.cc>
Date: Fri, 14 Jan 2022 16:48:46 +0000 (-0500)
Subject: Don't 'fall' and self-stone when flying down
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7efba965d9f369c39aa09669231d6f17bf9e4e7c;p=nethack

Don't 'fall' and self-stone when flying down

When a flying hero deliberately "swoops" through a trap door or hole,
consider the movement down to the next level to be controlled flight
rather than falling, preventing the sort of inadvertent touching of a
carried cockatrice corpse that happens when falling between levels.
---

diff --git a/src/trap.c b/src/trap.c
index e600b1871..4d5de4613 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -563,7 +563,7 @@ fall_through(
         Sprintf(msgbuf, "The hole in the %s above you closes up.",
                 ceiling(u.ux, u.uy));
 
-    schedule_goto(&dtmp, UTOTYPE_FALLING, (char *) 0,
+    schedule_goto(&dtmp, !Flying ? UTOTYPE_FALLING : UTOTYPE_NONE, (char *) 0,
                   !td ? msgbuf : (char *) 0);
 }