Merge branch 'NetHack-3.6.2'

This commit is contained in:
nhmall
2018-10-06 12:54:27 -04:00
42 changed files with 489 additions and 288 deletions

View File

@@ -780,13 +780,13 @@ struct attack *mattk;
/* Kill off aggressor if it didn't die. */
if (!(result & MM_AGR_DIED)) {
boolean was_leashed = (magr->mleashed);
boolean was_leashed = (magr->mleashed != 0);
mondead(magr);
if (!DEADMONSTER(magr))
return result; /* life saved */
result |= MM_AGR_DIED;
/* mondead() -> m_detach() -> m_unleash() always suppresses
the m_unleash() slack message, so deliver it here instead */
if (was_leashed)