Merge remote-tracking branch 'github/UniQP/trap' into NetHack-3.6.0

Also update fixes file
This commit is contained in:
Sean Hunt
2016-04-12 20:53:30 -04:00
2 changed files with 3 additions and 1 deletions

View File

@@ -203,6 +203,8 @@ wizard mode enlightenment was reporting "very fast innately" (which is not
possible) for very fast hero who was innately fast
when attacking a monster with a rust or corrosion or acid passive
counter-attack, grease wasn't protecting the attacker's weapon
the Bell of Opening now correctly reports when it opens a trapdoor/hole
knocking can no longer send a monster through a trapdoor/hole and desaddle it
post-3.6.0: fix "object lost" panic during pickup caused by sortloot revamp
post-3.6.0: more sortloot revisions

View File

@@ -4527,7 +4527,7 @@ boolean *noticed; /* set to true iff hero notices the effect; */
--force_mintrap;
/* mon might now be on the migrating monsters list */
}
return TRUE;
return result;
}
/* only called when the player is doing something to the chest directly */