Merge branch 'NetHack-3.6'

2019-11-05 11:02:24 -05:00
parent f07bf610b8 e8c5da768e
commit a7e3129919
17 changed files with 1402 additions and 1305 deletions
--- a/src/mon.c
+++ b/src/mon.c
@@ -3771,7 +3771,7 @@ boolean msg;      /* "The oldmon turns into a newmon!" */
    /* take on the new form... */
    set_mon_data(mtmp, mdat);

-    if (!leashable(mtmp))
+    if (mtmp->mleashed && !leashable(mtmp))
        m_unleash(mtmp, TRUE);

    if (emits_light(olddata) != emits_light(mtmp->data)) {