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

update a couple of tty perm_invent comments

Browse Source 
Gold can be quivered but not wielded, so remove the reference to the
latter.  Inuse-only mode gets passed lamps and leashes when they're
actively used, so remove the reference to that being different from
Qt's paperdoll.  (It is actually different, but not because they
won't be shown as in-use.  The paperdoll only shows one of each but
inventory of in-use items might have more than one of either or both.)
Add a what-if comment to tools_in_use().
This commit is contained in:
PatR
2023-10-22 16:44:49 -07:00
parent 85a5c3125e
commit 814a69f061
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/invent.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 invent.c $NHDT-Date: 1695159625 2023/09/19 21:40:25 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.449 $ */
/* NetHack 3.7 invent.c $NHDT-Date: 1698017900 2023/10/22 23:38:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.455 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -4746,10 +4746,15 @@ dopramulet(void)
static boolean
tool_being_used(struct obj *obj)
{
/*
* [Should this also include lit potions of oil? They're not tools
* but they are "in use" without being noticeable via obj->oworkmask.]
*/
if ((obj->owornmask & (W_TOOL | W_SADDLE)) != 0L)
return TRUE;
if (obj->oclass != TOOL_CLASS)
return FALSE;
/* [don't actually need to check uwep here; caller catches it] */
return (boolean) (obj == uwep || obj->lamplit
|| (obj->otyp == LEASH && obj->leashmon));
}