From: nhmall Date: Sat, 25 May 2019 04:42:29 +0000 (-0400) Subject: whitespace bit X-Git-Tag: nmake-explicit-path~2^2~104 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5d6ac55616384217be9c2c59b044b4842d8aa15;p=nethack whitespace bit --- diff --git a/src/hack.c b/src/hack.c index a4385673a..6f2489197 100644 --- a/src/hack.c +++ b/src/hack.c @@ -1782,7 +1782,7 @@ domove_core() if (u.usteed) u.usteed->mx = u.ux, u.usteed->my = u.uy; You("stop. %s can't move diagonally.", upstart(y_monnam(mtmp))); - } else if (u_with_boulder + } else if (u_with_boulder && !(verysmall(mtmp->data) && (!mtmp->minvent || (curr_mon_load(mtmp) <= 600)))) { /* can't swap places when pet won't fit there with the boulder */ @@ -1791,7 +1791,7 @@ domove_core() u.usteed->mx = u.ux, u.usteed->my = u.uy; You("stop. %s won't fit into the same spot that you're at.", upstart(y_monnam(mtmp))); - } else if (u.ux0 != x && u.uy0 != y && bad_rock(mtmp->data, x, u.uy0) + } else if (u.ux0 != x && u.uy0 != y && bad_rock(mtmp->data, x, u.uy0) && bad_rock(mtmp->data, u.ux0, y) && (bigmonst(mtmp->data) || (curr_mon_load(mtmp) > 600))) { /* can't swap places when pet won't fit thru the opening */