]> granicus.if.org Git - nethack/commitdiff
glob floor merge message
authornhmall <nhmall@nethack.org>
Fri, 17 May 2019 15:44:39 +0000 (11:44 -0400)
committernhmall <nhmall@nethack.org>
Fri, 17 May 2019 15:44:39 +0000 (11:44 -0400)
Make it more obvious that globs that just merged on the
floor may be at an adjacent location.

src/mkobj.c

index 2da16391a0788025a69694609a5e63cdcf666957..b88bc25a203d9e5f4c72af40894da61ba2281cbc 100644 (file)
@@ -2837,7 +2837,12 @@ struct obj *otmp2;
              * they'll be out of our view (minvent or container)
              * so don't actually show anything */
         } else if (onfloor || inpack) {
-            pline("The %s coalesce%s.", makeplural(obj_typename(otmp->otyp)),
+            boolean adj = ((otmp->ox != u.ux || otmp->oy != u.uy) &&
+                              (otmp2->ox != u.ux || otmp2->oy != u.uy));
+
+            pline("The %s%s coalesce%s.",
+                  (onfloor && adj) ? "adjacent " : "",
+                  makeplural(obj_typename(otmp->otyp)),
                   inpack ? " inside your pack" : "");
         }
     } else {