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

\#perminv, 1 of 2: groundwork

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
include/winX.h
View File

@@ -253,6 +253,11 @@ struct xwindow {
#define DEFAULT_LINES_DISPLAYED 12 /* # of lines displayed message window */
#define MAX_HISTORY 60 /* max history saved on message window */
/* flags for X11_yn_function_core() */
#define YN_NORMAL 0U /* no flags */
#define YN_NO_LOGMESG 1U /* suppress echo of prompt+response to message window
* and dumplog message history */
/* Window variables (winX.c). */
extern struct xwindow window_list[MAX_WINDOWS];
extern XtAppContext app_context; /* context of application */
@@ -442,7 +447,7 @@ extern void X11_add_menu(winid, const glyph_info *, const ANY_P *, char,
char, int, const char *, unsigned int);
extern void X11_end_menu(winid, const char *);
extern int X11_select_menu(winid, int, MENU_ITEM_P **);
extern void X11_update_inventory(void);
extern void X11_update_inventory(int);
extern void X11_mark_synch(void);
extern void X11_wait_synch(void);
#ifdef CLIPPING
@@ -456,6 +461,7 @@ extern int X11_nhgetch(void);
extern int X11_nh_poskey(int *, int *, int *);
extern void X11_nhbell(void);
extern int X11_doprev_message(void);
extern char X11_yn_function_core(const char *, const char *, char, unsigned);
extern char X11_yn_function(const char *, const char *, char);
extern void X11_getlin(const char *, char *);
extern int X11_get_ext_cmd(void);

2
include/wincurs.h
View File

@@ -87,7 +87,7 @@ extern void curses_add_menu(winid wid, const glyph_info *,
const char *str, unsigned int itemflags);
extern void curses_end_menu(winid wid, const char *prompt);
extern int curses_select_menu(winid wid, int how, MENU_ITEM_P **selected);
extern void curses_update_inventory(void);
extern void curses_update_inventory(int);
extern void curses_mark_synch(void);
extern void curses_wait_synch(void);
extern void curses_cliparound(int x, int y);

4
include/winprocs.h
View File

@@ -37,7 +37,7 @@ struct window_procs {
void (*win_end_menu)(winid, const char *);
int (*win_select_menu)(winid, int, MENU_ITEM_P **);
char (*win_message_menu)(char, int, const char *);
void (*win_update_inventory)(void);
void (*win_update_inventory)(int);
void (*win_mark_synch)(void);
void (*win_wait_synch)(void);
#ifdef CLIPPING
@@ -417,7 +417,7 @@ extern void safe_add_menu(winid, const glyph_info *, const ANY_P *,
extern void safe_end_menu(winid, const char *);
extern int safe_select_menu(winid, int, MENU_ITEM_P **);
extern char safe_message_menu(char, int, const char *);
extern void safe_update_inventory(void);
extern void safe_update_inventory(int);
extern void safe_mark_synch(void);
extern void safe_wait_synch(void);
#ifdef CLIPPING

2
include/wintty.h
View File

@@ -202,7 +202,7 @@ E void tty_add_menu(winid, const glyph_info *, const ANY_P *, char, char,
E void tty_end_menu(winid, const char *);
E int tty_select_menu(winid, int, MENU_ITEM_P **);
E char tty_message_menu(char, int, const char *);
E void tty_update_inventory(void);
E void tty_update_inventory(int);
E void tty_mark_synch(void);
E void tty_wait_synch(void);
#ifdef CLIPPING