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

fix [pre-]beta 'Du' bug with containers in shops

Browse Source 
'Du' in a shop was listing hero-owned containers that didn't contain
any unpaid items.  At least one unpaid item must be carried; bug
manifested iff one or more unpaid items followed the container in
the invent list.

Recently revised allow_category() was using count_unpaid() for
container contents incorrectly, inadvertently checking the rest of
inventory after the container in addition to its contents.
This commit is contained in:
PatR
2015-05-28 02:22:48 -07:00
parent c3d579007a
commit 7e05f03bc4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pickup.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 pickup.c $NHDT-Date: 1432512773 2015/05/25 00:12:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.155 $ */ /* NetHack 3.6 pickup.c $NHDT-Date: 1432804962 2015/05/28 09:22:42 $ $NHDT-Branch: master $:$NHDT-Revision: 1.157 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -401,7 +401,7 @@ struct obj *obj;
/* if unpaid is expected and obj isn't unpaid, reject (treat a container /* if unpaid is expected and obj isn't unpaid, reject (treat a container
holding any unpaid object as unpaid even if isn't unpaid itself) */ holding any unpaid object as unpaid even if isn't unpaid itself) */
if (shop_filter && !obj->unpaid if (shop_filter && !obj->unpaid
&& !(Has_contents(obj) && count_unpaid(obj) > 0)) && !(Has_contents(obj) && count_unpaid(obj->cobj) > 0))
return FALSE; return FALSE;
/* check for particular bless/curse state */ /* check for particular bless/curse state */
if (bucx_filter) { if (bucx_filter) {