From: nhmall <nhmall@nethack.org>
Date: Sat, 25 May 2019 04:35:48 +0000 (-0400)
Subject: Merge branch 'NetHack-3.6'
X-Git-Tag: NetHack-3.7.0_WIP~403
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea7574ced90bad05a128939c3cf622e91789c699;p=nethack

Merge branch 'NetHack-3.6'
---

ea7574ced90bad05a128939c3cf622e91789c699
diff --cc src/hack.c
index 18709fcb4,a4385673a..5f0da7986
--- a/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