fix #K965 - dropped fragile items don't break
when the drop is being caused by encumbrance or punishment triggering a fall while going down stairs. Also, remove a couple instances of 'if (obj==GOLD) contexl.botl=TRUE' when dropping gold. They were held over from the obsolete !GOLDOBJ configuration. Both are immediately followed by freeinv() which calls freeinv_core() whichs starts off by setting the botl flag when taking gold out of inventory.
This commit is contained in:
6
src/do.c
6
src/do.c
@@ -647,9 +647,6 @@ register struct obj *obj;
|
||||
ELevitation = W_ART; /* other than W_ARTI */
|
||||
if (flags.verbose)
|
||||
You("drop %s.", doname(obj));
|
||||
/* Ensure update when we drop gold objects */
|
||||
if (obj->oclass == COIN_CLASS)
|
||||
g.context.botl = 1;
|
||||
freeinv(obj);
|
||||
hitfloor(obj, TRUE);
|
||||
if (levhack)
|
||||
@@ -670,9 +667,6 @@ void
|
||||
dropx(obj)
|
||||
register struct obj *obj;
|
||||
{
|
||||
/* Ensure update when we drop gold objects */
|
||||
if (obj->oclass == COIN_CLASS)
|
||||
g.context.botl = 1;
|
||||
freeinv(obj);
|
||||
if (!u.uswallow) {
|
||||
if (ship_object(obj, u.ux, u.uy, FALSE))
|
||||
|
||||
Reference in New Issue
Block a user