Merge branch 'NetHack-3.6'

diff --cc src/hack.c
index 18709fcb470e6265a0afee9087ac6db16b6d488d,a4385673a114143493c901581e26b46fcd224a4c..5f0da798645ef44585eea670d8b139009cfb2140
--- 1/src/hack.c
--- 2/src/hack.c
+++ b/src/hack.c
@@@ -1352,12 -1354,13 +1352,13 @@@ domove_core(
      xchar chainx = 0, chainy = 0,
            ballx = 0, bally = 0;         /* ball&chain new positions */
      int bc_control = 0;                 /* control for ball&chain */
-     boolean cause_delay = FALSE;        /* dragging ball will skip a move */
+     boolean cause_delay = FALSE,        /* dragging ball will skip a move */
+             u_with_boulder = (sobj_at(BOULDER, u.ux, u.uy) != 0);
  
 -    if (context.travel) {
 +    if (g.context.travel) {
          if (!findtravelpath(FALSE))
              (void) findtravelpath(TRUE);
 -        context.travel1 = 0;
 +        g.context.travel1 = 0;
      }
  
      if (((wtcap = near_capacity()) >= OVERLOADED