nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix bz210, H4114: Castle chest can be trapped

Browse Source
This commit is contained in:
Pasi Kallinen
2015-12-24 14:07:35 +02:00
parent 69e7f4e29b
commit 1cddb2f717
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes36.1
View File

@@ -56,6 +56,7 @@ travel will displace pets rather than stop
do not autopickup unpaid items in shops do not autopickup unpaid items in shops
death due an unseen gas spore's explosion resulted in "killed by a died" 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 allow optional parameter "true", "yes", "false", or "no" for boolean options
actually make the castle chest not trapped
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

6
src/sp_lev.c
View File

@@ -1823,8 +1823,8 @@ struct mkroom *croom;
otmp->obroken = 1; otmp->obroken = 1;
otmp->olocked = 0; /* obj generation may set */ otmp->olocked = 0; /* obj generation may set */
} }
if (o->trapped) if (o->trapped == 0 || o->trapped == 1)
otmp->otrapped = 1; otmp->otrapped = o->trapped;
if (o->greased) if (o->greased)
otmp->greased = 1; otmp->greased = 1;
#ifdef INVISIBLE_OBJECTS #ifdef INVISIBLE_OBJECTS
@@ -3023,7 +3023,7 @@ struct sp_coder *coder;
tmpobj.lit = 0; tmpobj.lit = 0;
tmpobj.eroded = 0; tmpobj.eroded = 0;
tmpobj.locked = 0; tmpobj.locked = 0;
tmpobj.trapped = 0; tmpobj.trapped = -1;
tmpobj.recharged = 0; tmpobj.recharged = 0;
tmpobj.invis = 0; tmpobj.invis = 0;
tmpobj.greased = 0; tmpobj.greased = 0;