nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-05-17 12:06:58 -04:00
parent 23d160f705 2aee73642d
commit c5fbae0a4c
7 changed files with 195 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mkobj.c
View File

@@ -2755,6 +2755,10 @@ struct obj **obj1, **obj2;
otmp1 = *obj1;
otmp2 = *obj2;
if (otmp1 && otmp2 && otmp1 != otmp2) {
if (otmp1->unpaid || otmp2->unpaid)
globby_bill_fixup(otmp1, otmp2);
else if (costly_spot(otmp1->ox, otmp1->oy))
globby_donation(otmp1, otmp2);
if (otmp1->bknown != otmp2->bknown)
otmp1->bknown = otmp2->bknown = 0;
if (otmp1->rknown != otmp2->rknown)
@@ -2837,7 +2841,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 {