From: Pasi Kallinen <paxed@alt.org>
Date: Sun, 29 May 2022 06:42:25 +0000 (+0300)
Subject: Fire trap on ice can indirectly kill a monster via drowning
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=134363cead8dc0ca59f699028af6cbcc0530e81e;p=nethack

Fire trap on ice can indirectly kill a monster via drowning

Make the trap routine claim the trap killed the monster even
though it was drowning that did it, otherwise callers cannot
rely on the trap routine return value.
---

diff --git a/src/trap.c b/src/trap.c
index 6f46d6942..00ff3e17e 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -1533,6 +1533,8 @@ trapeffect_fire_trap(
             You("smell smoke.");
         if (is_ice(tx, ty))
             melt_ice(tx, ty, (char *) 0);
+        if (DEADMONSTER(mtmp))
+            trapkilled = TRUE;
         if (see_it && t_at(tx, ty))
             seetrap(t_at(tx, ty));