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

delobj() rejection

Browse Source 
If the Amulet or an invocation item refuses to be deleted, make sure
the retained object doesn't get left with its in_use bit set.  I'm not
sure whether there are any cases where this matters.
This commit is contained in:
PatR
2021-08-19 14:55:22 -07:00
parent 4c31bac353
commit 3736f2ba4c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/invent.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 invent.c $NHDT-Date: 1629408035 2021/08/19 21:20:35 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.338 $ */ /* NetHack 3.7 invent.c $NHDT-Date: 1629409876 2021/08/19 21:51:16 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.339 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */ /*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1168,6 +1168,7 @@ freeinv(struct obj *obj)
update_inventory(); update_inventory();
} }
/* drawbridge is destroying all objects at <x,y> */
void void
delallobj(int x, int y) delallobj(int x, int y)
{ {
@@ -1199,6 +1200,7 @@ delobj(struct obj *obj)
* are indestructible via drawbridges, and exploding * are indestructible via drawbridges, and exploding
* chests, and golem creation, and ... * chests, and golem creation, and ...
*/ */
obj->in_use = 0; /* in case caller has set this to 1 */
return; return;
} }
update_map = (obj->where == OBJ_FLOOR); update_map = (obj->where == OBJ_FLOOR);