From: Pasi Kallinen <paxed@alt.org>
Date: Thu, 24 Dec 2015 12:07:35 +0000 (+0200)
Subject: Fix bz210, H4114: Castle chest can be trapped
X-Git-Tag: NetHack-3.7.0_WIP~781^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cddb2f717ccd9b229faa4e26b99c478e5ab1199;p=nethack

Fix bz210, H4114: Castle chest can be trapped
---

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index 92e097380..a2e3933f8 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -56,6 +56,7 @@ travel will displace pets rather than stop
 do not autopickup unpaid items in shops
 death due an unseen gas spore's explosion resulted in "killed by a died"
 allow optional parameter "true", "yes", "false", or "no" for boolean options
+actually make the castle chest not trapped
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/sp_lev.c b/src/sp_lev.c
index dc454128a..f65e3c270 100644
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -1823,8 +1823,8 @@ struct mkroom *croom;
         otmp->obroken = 1;
         otmp->olocked = 0; /* obj generation may set */
     }
-    if (o->trapped)
-        otmp->otrapped = 1;
+    if (o->trapped == 0 || o->trapped == 1)
+        otmp->otrapped = o->trapped;
     if (o->greased)
         otmp->greased = 1;
 #ifdef INVISIBLE_OBJECTS
@@ -3023,7 +3023,7 @@ struct sp_coder *coder;
     tmpobj.lit = 0;
     tmpobj.eroded = 0;
     tmpobj.locked = 0;
-    tmpobj.trapped = 0;
+    tmpobj.trapped = -1;
     tmpobj.recharged = 0;
     tmpobj.invis = 0;
     tmpobj.greased = 0;