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

follow-up: just use existing carrying()

Browse Source
This commit is contained in:
nhmall
2025-12-09 15:25:10 -05:00
parent 6ba053669e
commit 7dc4512bb3
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/extern.h
View File

@@ -1360,7 +1360,6 @@ extern void perm_invent_toggled(boolean negated);
extern void prepare_perminvent(winid window); extern void prepare_perminvent(winid window);
extern struct obj *carrying_stoning_corpse(void); extern struct obj *carrying_stoning_corpse(void);
extern void repopulate_perminvent(void); extern void repopulate_perminvent(void);
extern boolean hero_has_one_of_these(short);
/* ### ioctl.c ### */ /* ### ioctl.c ### */

2
src/do_name.c
View File

@@ -671,7 +671,7 @@ docall(struct obj *obj)
*uname_p = dupstr(buf); *uname_p = dupstr(buf);
discover_object(obj->otyp, FALSE, TRUE, TRUE); /* possibly add to disco[] */ discover_object(obj->otyp, FALSE, TRUE, TRUE); /* possibly add to disco[] */
} }
if (obj->where == OBJ_INVENT || hero_has_one_of_these(obj->otyp)) if (obj->where == OBJ_INVENT || carrying(obj->otyp))
update_inventory(); update_inventory();
} }

12
src/invent.c
View File

@@ -2779,18 +2779,6 @@ learn_unseen_invent(void)
update_inventory(); update_inventory();
} }
boolean
hero_has_one_of_these(short otyp)
{
struct obj *otmp;
for (otmp = gi.invent; otmp; otmp = otmp->nobj) {
if (otmp->otyp == otyp)
return TRUE;
}
return FALSE;
}
/* persistent inventory window is maintained by interface code; /* persistent inventory window is maintained by interface code;
'update_inventory' used to be a macro for 'update_inventory' used to be a macro for
(*windowprocs.win_update_inventory) but the restore hackery to suppress (*windowprocs.win_update_inventory) but the restore hackery to suppress