Merge remote-tracking branch 'origin/NetHack-3.6.0'

This commit is contained in:
keni
2017-10-01 17:19:23 -04:00
53 changed files with 3458 additions and 1640 deletions

View File

@@ -158,7 +158,10 @@ const char *verb;
(mtmp) ? "" : " with you");
if (mtmp) {
if (!passes_walls(mtmp->data) && !throws_rocks(mtmp->data)) {
if (hmon(mtmp, obj, TRUE) && !is_whirly(mtmp->data))
int dieroll = rnd(20);
if (hmon(mtmp, obj, HMON_THROWN, dieroll)
&& !is_whirly(mtmp->data))
return FALSE; /* still alive */
}
mtmp->mtrapped = 0;