fix #H2671 - feedback when entering untended shop while blind

     From a bug report, you get the message "this shop
appears to be deserted" when entering a shop whose shopkeeper is not there,
even if you can't see at the time.  Change it to be
 'this shop is deserted'
     when you can see that the shop is empty,
 'this shop is untended'
     when there's no shopkeeper but you can see some other monster(s) inside,
 'this shop seems to be deserted'
     when you can see but there is a monster that you can't see (probably a
     hidden mimic, but possibly an invisible monster or one standing behind
     a boulder that's ended up in the shop), or
 'this shop seems to be untended'
     when you can't see (and don't have active telepathy or persistent
     monster detection).

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index f4acb4cc003765e57159aa498203dc4f486aae97..a203d3bc532ba7e5ca3f94b38ef277bb22575263 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -844,6 +844,7 @@ very fast hero would sometimes take two consecutive moves with very fast
        monsters then getting two moves, instead of interleaving the activity
 when a monster zapped by polymorph drops inventory because of its new form,
        don't let that same zap hit the dropped item(s)
+entering an untended shop while blind gave an inappropriate message
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/shk.c b/src/shk.c
index 792911d8f33e258e6088018f20e68a3eea5db51c..ef8fed9527405eeef45acd3e1cde3f73fc6f0005 100644 (file)
--- a/src/shk.c
+++ b/src/shk.c
@@ -69,6 +69,7 @@ STATIC_DCL void FDECL(add_to_billobjs, (struct obj *));
 STATIC_DCL void FDECL(bill_box_content, (struct obj *, BOOLEAN_P, BOOLEAN_P,
                                     struct monst *));
 STATIC_DCL boolean FDECL(rob_shop, (struct monst *));
+STATIC_DCL void FDECL(deserted_shop, (char *));
 STATIC_DCL boolean FDECL(special_stock, (struct obj *, struct monst *, BOOLEAN_P));
 STATIC_DCL const char *FDECL(cad, (BOOLEAN_P));
 
@@ -486,15 +487,44 @@ struct monst *shkp;
        return TRUE;
 }
 
+/* give a message when entering an untended shop (caller has verified that) */
+STATIC_OVL void
+deserted_shop(enterstring)
+/*const*/ char *enterstring;
+{
+    struct monst *mtmp;
+    struct mkroom *r = &rooms[(int) *enterstring - ROOMOFFSET];
+    int x, y, m = 0, n = 0;
+
+    for (x = r->lx; x <= r->hx; ++x)
+       for (y = r->ly; y <= r->hy; ++y) {
+           if (x == u.ux && y == u.uy) continue;
+           if ((mtmp = m_at(x, y)) != 0) {
+               ++n;
+               if (sensemon(mtmp) ||
+                   ((mtmp->m_ap_type == M_AP_NOTHING ||
+                     mtmp->m_ap_type == M_AP_MONSTER) &&
+                    canseemon(mtmp)))
+                   ++m;
+           }
+       }
+
+    if (Blind && !(Blind_telepat || Detect_monsters))
+       ++n;    /* force feedback to be less specific */
+
+    pline("This shop %s %s.",
+         (m < n) ? "seems to be" : "is",
+         !n ? "deserted" : "untended");
+}
+
 void
 u_entered_shop(enterstring)
-register char *enterstring;
+char *enterstring;
 {
 
        register int rt;
        register struct monst *shkp;
        register struct eshk *eshkp;
-       static const char no_shk[] = "This shop appears to be deserted.";
        static char empty_shops[5];
 
        if(!*enterstring)
@@ -504,7 +534,7 @@ register char *enterstring;
            if (!index(empty_shops, *enterstring) &&
                in_rooms(u.ux, u.uy, SHOPBASE) !=
                                  in_rooms(u.ux0, u.uy0, SHOPBASE))
-               pline(no_shk);
+               deserted_shop(enterstring);
            Strcpy(empty_shops, u.ushops);
            u.ushops[0] = '\0';
            return;
@@ -516,7 +546,7 @@ register char *enterstring;
            /* dump core when referenced */
            eshkp->bill_p = (struct bill_x *) -1000;
            if (!index(empty_shops, *enterstring))
-               pline(no_shk);
+               deserted_shop(enterstring);
            Strcpy(empty_shops, u.ushops);
            u.ushops[0] = '\0';
            return;