From 348f88c7269c239b3a22cff1f33d934bdb2e1dd2 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Fri, 8 Dec 2023 18:31:16 +0200
Subject: [PATCH] Walking into a shopkeeper tries to pay the bill

---
 doc/fixes3-7-0.txt | 1 +
 src/uhitm.c        | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 3496a777b..2249db164 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1319,6 +1319,7 @@ spellbooks weight 50 units but Book of the Dead only 20, and novels only 1;
 save and restore hero tracks, increase track length
 change vrock and hezrou from red to green, adjust vrock tile to have green
 change wolf and werewolf to grey, warg to black
+walking into a shopkeeper tries to pay the bill
 
 
 Fixes to 3.7.0-x General Problems Exposed Via git Repository
diff --git a/src/uhitm.c b/src/uhitm.c
index 951e94f00..85ba4ad13 100644
--- a/src/uhitm.c
+++ b/src/uhitm.c
@@ -478,6 +478,9 @@ do_attack(struct monst *mtmp)
             if (inshop || foo) {
                 char buf[BUFSZ];
 
+                if (!gc.context.travel && !gc.context.run)
+                    return ECMD_TIME | dopay();
+
                 if (mtmp->mtame) /* see 'additional considerations' above */
                     monflee(mtmp, rnd(6), FALSE, FALSE);
                 Strcpy(buf, y_monnam(mtmp));