From: PatR <rankin@nethack.org>
Date: Thu, 22 Nov 2018 03:16:23 +0000 (-0800)
Subject: fix #H7585 - can't untrap from edge of pit
X-Git-Tag: NetHack-3.6.2_Released~162^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac9bdc8aa76929a2dc3c9b2559d7dea6a3a3a3a0;p=nethack

fix #H7585 - can't untrap from edge of pit

Attempting to untrap an adjacent location failed if you had escaped a
pit, claiming that you couldn't reach.  You can't reach the bottom of
the pit if you're not in it, but you should be able to reach adjacent
spots normally.
---

diff --git a/doc/fixes36.2 b/doc/fixes36.2
index 3f6bc996f..2ad652f36 100644
--- a/doc/fixes36.2
+++ b/doc/fixes36.2
@@ -207,6 +207,8 @@ if a migrating monster was killed off because there was no room on the
 	which should never leave one (demon, golem, blob, &c)
 end of game while carrying Schroedinger's Box would reveal cat-or-corpse
 	for inventory disclosure or put that info into dumplog, but not both
+attempting to untrap an adjacent trap while on the edge of--not in--a pit
+	failed due to not being able to reach the floor
 
 
 Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository
diff --git a/src/trap.c b/src/trap.c
index da7e01625..330fa73e2 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	trap.c	$NHDT-Date: 1542765365 2018/11/21 01:56:05 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.303 $ */
+/* NetHack 3.6	trap.c	$NHDT-Date: 1542856572 2018/11/22 03:16:12 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.304 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -4038,7 +4038,7 @@ boolean force_failure;
         }
     }
     /* untrappable traps are located on the ground. */
-    if (!can_reach_floor(TRUE)) {
+    if (!can_reach_floor(under_u)) {
         if (u.usteed && P_SKILL(P_RIDING) < P_BASIC)
             rider_cant_reach();
         else