From: PatR <rankin@nethack.org>
Date: Mon, 23 Apr 2018 07:39:57 +0000 (-0700)
Subject: fix #H7079 - melting ice destroys lowered dbridge
X-Git-Tag: NetHack-3.6.1_RC01~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1dd895dc2087e52e332c44e6214cb6b9d29404a;p=nethack

fix #H7079 - melting ice destroys lowered dbridge

melt_ice() attempted to handle this but checked for raised drawbridge
instead of lowered one.
---

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index 818d1e040..fc07fd7e1 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -541,6 +541,7 @@ at the prompt for entering a level annotation, responding with <return>
 	erroneously removed old annotation; use <space><return> to do that
 reorder the #droptype menu and add some separator lines
 moving from a pit to an adjacent pit with uncleared debris shouldn't be a fall
+open drawbridge spanning ice would vanish if the ice melted
 
 
 Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
diff --git a/src/zap.c b/src/zap.c
index ef5a68c66..78b615274 100644
--- a/src/zap.c
+++ b/src/zap.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	zap.c	$NHDT-Date: 1520705645 2018/03/10 18:14:05 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.271 $ */
+/* NetHack 3.6	zap.c	$NHDT-Date: 1524469189 2018/04/23 07:39:49 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.274 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -4180,7 +4180,7 @@ const char *msg;
 
     if (!msg)
         msg = "The ice crackles and melts.";
-    if (lev->typ == DRAWBRIDGE_UP) {
+    if (lev->typ == DRAWBRIDGE_DOWN) {
         lev->drawbridgemask &= ~DB_ICE; /* revert to DB_MOAT */
     } else { /* lev->typ == ICE */
 #ifdef STUPID