Prevent conflicted shopkeeper moving on top of hero

Peaceful, but conflicted, shopkeeper could move on top
of the hero, if hero was standing on the free spot inside shop.
This commit is contained in:
Pasi Kallinen
2023-04-13 21:17:28 +03:00
parent ad4c71fab3
commit 25bf9d2a49

View File

@@ -113,7 +113,7 @@ move_special(struct monst *mtmp, boolean in_his_shop, schar appr,
}
}
if (MON_AT(nix, niy))
if (MON_AT(nix, niy) || u_at(nix, niy))
return 0;
remove_monster(omx, omy);
place_monster(mtmp, nix, niy);