\#perminv, 1 of 2: groundwork

Give the window-port side of *_update_inventory() an argument.
Calls in the core still omit that; invent.c's update_inventory()
is the only place that cares.
This commit is contained in:
PatR
2021-03-13 18:17:00 -08:00
parent 160344feaa
commit dd49431296
21 changed files with 235 additions and 179 deletions

View File

@@ -2282,13 +2282,13 @@ update_inventory(void)
return;
/*
* Ought to check (windowprocs.wincap2 & WC2_PERM_INVENT) here....
* Ought to check (windowprocs.wincap & WC_PERM_INVENT) here....
*
* We currently don't skip this call when iflags.perm_invent is False
* because curses uses that to disable a previous perm_invent window
* (after toggle via 'O'; perhaps the options code should handle that).
*/
(*windowprocs.win_update_inventory)();
(*windowprocs.win_update_inventory)(0);
}
/* should of course only be called for things in invent */

View File

@@ -551,15 +551,14 @@ static struct window_procs hup_procs = {
hup_curs, hup_putstr, hup_putstr, /* putmixed */
hup_display_file, hup_void_fdecl_winid_ulong, /* start_menu */
hup_add_menu, hup_end_menu, hup_select_menu, genl_message_menu,
hup_void_ndecl, /* update_inventory */
hup_void_fdecl_int, /* update_inventory */
hup_void_ndecl, /* mark_synch */
hup_void_ndecl, /* wait_synch */
#ifdef CLIPPING
hup_cliparound,
#endif
#ifdef POSITIONBAR
(void (*)(char *)) hup_void_fdecl_constchar_p,
/* update_positionbar */
(void (*)(char *)) hup_void_fdecl_constchar_p, /* update_positionbar */
#endif
hup_print_glyph,
hup_void_fdecl_constchar_p, /* raw_print */