Merge branch 'NetHack-3.6'

2019-10-17 20:52:10 -04:00
parent 72fcfadf23 389c496055
commit 3ccc6e5308
19 changed files with 742 additions and 473 deletions
--- a/src/priest.c
+++ b/src/priest.c
@@ -118,6 +118,8 @@ pick_move:
    }

    if (nix != omx || niy != omy) {
+        if (MON_AT(nix, niy))
+            return 0;
        remove_monster(omx, omy);
        place_monster(mtmp, nix, niy);
        newsym(nix, niy);