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

container_impact_dmg

Browse Source 
A post-3.4.3 change made the contents of thrown (or dropped while
levitating) containers subject to breakage, but it had sequence issues.
When something was thrown from outside a shop (or from its doorway or
entry spot) and arrived inside, the shopkeeper was taking possession too
soon, charging the hero for any broken contents, and then going ballistic
(summoning kops and attacking) because the hero was outside the shop while
owing money.  We need to break contents before shk claims ownership, which
turned out to be trickier than it sounds since it has to occur after any
item-hits-floor message if such feedback is given.

    Also, clear the container's contents-known flag when contents break.
Conceivably it should stay set when there is only one item, since hearing
something break could only be that item, but this resets container->cknown
unconditionally if anything inside breaks.
This commit is contained in:
nethack.rankin
2012-05-05 23:26:26 +00:00
parent 07f6cd66d4
commit 669c2ab560
4 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dothrow.c
View File

@@ -423,8 +423,7 @@ register struct obj *obj;
if (hero_breaks(obj, u.ux, u.uy, TRUE)) return;
if (ship_object(obj, u.ux, u.uy, FALSE)) return;
dropy(obj);
if (!u.uswallow) container_impact_dmg(obj);
dropz(obj, TRUE);
}
/*
@@ -1194,6 +1193,14 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
}
thrownobj = (struct obj*)0;
place_object(obj, bhitpos.x, bhitpos.y);
/* container contents might break;
do so before turning ownership of thrownobj over to shk
(container_impact_dmg handles item already owned by shop) */
if (!IS_SOFT(levl[bhitpos.x][bhitpos.y].typ))
/* <x,y> is spot where you initiated throw, not bhitpos */
container_impact_dmg(obj, u.ux, u.uy);
/* charge for items thrown out of shop;
shk takes possession for items thrown into one */
if ((*u.ushops || obj->unpaid) && obj != uball)
check_shop_obj(obj, bhitpos.x, bhitpos.y, FALSE);
@@ -1204,8 +1211,6 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
newsym(bhitpos.x,bhitpos.y);
if (obj_sheds_light(obj))
vision_full_recalc = 1;
if (!IS_SOFT(levl[bhitpos.x][bhitpos.y].typ))
container_impact_dmg(obj);
}
}