Merge branch 'NetHack-3.6.2'

2018-10-06 12:54:27 -04:00
parent c29e4c572e 232f016257
commit 41a10e28ae
42 changed files with 489 additions and 288 deletions
--- a/src/makemon.c
+++ b/src/makemon.c
@@ -1391,8 +1391,8 @@ int mmflags;
    }

    if (allow_minvent && migrating_objs)
-        deliver_obj_to_mon(mtmp, 1, DF_NONE); /* in case there's waiting items */
-    
+        deliver_obj_to_mon(mtmp, 1, DF_NONE); /* in case of waiting items */
+
    if (!in_mklev)
        newsym(mtmp->mx, mtmp->my); /* make sure the mon shows up */