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

fix curses' create_nhmenu() warning

Browse Source 
The extra flags argument to create_nhmenu() wasn't propagated to
anywhere useful.  It still doesn't do anything yet.
This commit is contained in:
PatR
2020-02-25 16:18:58 -08:00
parent 19df82971d
commit cff63b5b4c
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wincurs.h
View File

@@ -173,7 +173,7 @@ extern void curses_line_input_dialog(const char *prompt,
extern int curses_character_input_dialog(const char *prompt, extern int curses_character_input_dialog(const char *prompt,
const char *choices, CHAR_P def); const char *choices, CHAR_P def);
extern int curses_ext_cmd(void); extern int curses_ext_cmd(void);
extern void curses_create_nhmenu(winid wid); extern void curses_create_nhmenu(winid wid, unsigned long);
extern void curses_add_nhmenu_item(winid wid, int glyph, extern void curses_add_nhmenu_item(winid wid, int glyph,
const ANY_P *identifier, CHAR_P accelerator, const ANY_P *identifier, CHAR_P accelerator,
CHAR_P group_accel, int attr, CHAR_P group_accel, int attr,

5
win/curses/cursdial.c
View File

@@ -83,6 +83,7 @@ typedef struct nhm {
int num_pages; /* Number of display pages for entry */ int num_pages; /* Number of display pages for entry */
int height; /* Window height of menu */ int height; /* Window height of menu */
int width; /* Window width of menu */ int width; /* Window width of menu */
unsigned long mbehavior; /* menu flags */
boolean reuse_accels; /* Non-unique accelerators per page */ boolean reuse_accels; /* Non-unique accelerators per page */
boolean bottom_heavy; /* display multi-page menu starting at end */ boolean bottom_heavy; /* display multi-page menu starting at end */
struct nhm *prev_menu; /* Pointer to previous entry */ struct nhm *prev_menu; /* Pointer to previous entry */
@@ -510,7 +511,7 @@ curses_ext_cmd()
/* Initialize a menu from given NetHack winid */ /* Initialize a menu from given NetHack winid */
void void
curses_create_nhmenu(winid wid) curses_create_nhmenu(winid wid, unsigned long mbehavior)
{ {
nhmenu *new_menu = NULL; nhmenu *new_menu = NULL;
nhmenu *menuptr = nhmenus; nhmenu *menuptr = nhmenus;
@@ -541,6 +542,7 @@ curses_create_nhmenu(winid wid)
new_menu->num_pages = 0; new_menu->num_pages = 0;
new_menu->height = 0; new_menu->height = 0;
new_menu->width = 0; new_menu->width = 0;
new_menu->mbehavior = mbehavior;
new_menu->reuse_accels = FALSE; new_menu->reuse_accels = FALSE;
new_menu->bottom_heavy = FALSE; new_menu->bottom_heavy = FALSE;
return; return;
@@ -553,6 +555,7 @@ curses_create_nhmenu(winid wid)
new_menu->num_pages = 0; new_menu->num_pages = 0;
new_menu->height = 0; new_menu->height = 0;
new_menu->width = 0; new_menu->width = 0;
new_menu->mbehavior = mbehavior;
new_menu->reuse_accels = FALSE; new_menu->reuse_accels = FALSE;
new_menu->bottom_heavy = FALSE; new_menu->bottom_heavy = FALSE;
new_menu->next_menu = NULL; new_menu->next_menu = NULL;

2
win/curses/cursdial.h
View File

@@ -12,7 +12,7 @@ void curses_line_input_dialog(const char *prompt, char *answer, int buffer);
int curses_character_input_dialog(const char *prompt, const char *choices, int curses_character_input_dialog(const char *prompt, const char *choices,
CHAR_P def); CHAR_P def);
int curses_ext_cmd(void); int curses_ext_cmd(void);
void curses_create_nhmenu(winid wid); void curses_create_nhmenu(winid wid, unsigned long);
void curses_add_nhmenu_item(winid wid, int glyph, const ANY_P *identifier, void curses_add_nhmenu_item(winid wid, int glyph, const ANY_P *identifier,
CHAR_P accelerator, CHAR_P group_accel, int attr, CHAR_P accelerator, CHAR_P group_accel, int attr,
const char *str, unsigned itemflags); const char *str, unsigned itemflags);

2
win/curses/cursmain.c
View File

@@ -485,7 +485,7 @@ curses_start_menu(winid wid, unsigned long mbehavior)
if (inv_update) if (inv_update)
return; return;
curses_create_nhmenu(wid); curses_create_nhmenu(wid, mbehavior);
} }
/* /*

2
win/curses/cursmesg.c
View File

@@ -367,7 +367,7 @@ curses_prev_mesg()
boolean do_lifo = (iflags.prevmsg_window != 'f'); boolean do_lifo = (iflags.prevmsg_window != 'f');
wid = curses_get_wid(NHW_MENU); wid = curses_get_wid(NHW_MENU);
curses_create_nhmenu(wid); curses_create_nhmenu(wid, 0UL);
Id = cg.zeroany; Id = cg.zeroany;
for (count = 0; count < num_messages; ++count) { for (count = 0; count < num_messages; ++count) {

2
win/curses/cursmisc.c
View File

@@ -671,7 +671,7 @@ curses_view_file(const char *filename, boolean must_exist)
} }
wid = curses_get_wid(NHW_MENU); wid = curses_get_wid(NHW_MENU);
curses_create_nhmenu(wid); curses_create_nhmenu(wid, 0UL);
Id = cg.zeroany; Id = cg.zeroany;
while (dlb_fgets(buf, BUFSZ, fp) != NULL) { while (dlb_fgets(buf, BUFSZ, fp) != NULL) {