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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-02-08 14:53:22 -05:00
parent c2d3fb816a c2db9405f8
commit 88683be479
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
win/curses/cursmesg.c
View File

@@ -281,23 +281,20 @@ curses_prev_mesg()
int count; int count;
winid wid; winid wid;
long turn = 0; long turn = 0;
anything *identifier; anything Id;
nhprev_mesg *mesg; nhprev_mesg *mesg;
menu_item *selected = NULL; menu_item *selected = NULL;
wid = curses_get_wid(NHW_MENU); wid = curses_get_wid(NHW_MENU);
curses_create_nhmenu(wid); curses_create_nhmenu(wid);
identifier = (anything *) alloc((unsigned) sizeof (anything)); Id = zeroany;
identifier->a_void = NULL;
for (count = 0; count < num_messages; count++) { for (count = 0; count < num_messages; count++) {
mesg = get_msg_line(TRUE, count); mesg = get_msg_line(TRUE, count);
if ((turn != mesg->turn) && (count != 0)) { if ((turn != mesg->turn) && (count != 0)) {
curses_add_menu(wid, NO_GLYPH, identifier, 0, 0, A_NORMAL, curses_add_menu(wid, NO_GLYPH, &Id, 0, 0, A_NORMAL, "---", FALSE);
"---", FALSE);
} }
curses_add_menu(wid, NO_GLYPH, identifier, 0, 0, A_NORMAL, curses_add_menu(wid, NO_GLYPH, &Id, 0, 0, A_NORMAL, mesg->str, FALSE);
mesg->str, FALSE);
turn = mesg->turn; turn = mesg->turn;
} }

7
win/curses/cursmisc.c
View File

@@ -573,7 +573,7 @@ void
curses_view_file(const char *filename, boolean must_exist) curses_view_file(const char *filename, boolean must_exist)
{ {
winid wid; winid wid;
anything *identifier; anything Id;
char buf[BUFSZ]; char buf[BUFSZ];
menu_item *selected = NULL; menu_item *selected = NULL;
dlb *fp = dlb_fopen(filename, "r"); dlb *fp = dlb_fopen(filename, "r");
@@ -588,11 +588,10 @@ 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);
identifier = (anything *) alloc(sizeof (anything)); Id = zeroany;
identifier->a_void = NULL;
while (dlb_fgets(buf, BUFSZ, fp) != NULL) { while (dlb_fgets(buf, BUFSZ, fp) != NULL) {
curses_add_menu(wid, NO_GLYPH, identifier, 0, 0, A_NORMAL, buf, FALSE); curses_add_menu(wid, NO_GLYPH, &Id, 0, 0, A_NORMAL, buf, FALSE);
} }
dlb_fclose(fp); dlb_fclose(fp);

8
win/curses/curswins.c
View File

@@ -473,7 +473,7 @@ curses_get_window_orientation(winid wid)
void void
curses_puts(winid wid, int attr, const char *text) curses_puts(winid wid, int attr, const char *text)
{ {
anything *identifier; anything Id;
WINDOW *win = NULL; WINDOW *win = NULL;
if (is_main_window(wid)) { if (is_main_window(wid)) {
@@ -502,10 +502,8 @@ curses_puts(winid wid, int attr, const char *text)
wid); wid);
return; return;
} }
identifier = (anything *) alloc((unsigned) sizeof (anything)); Id = zeroany;
identifier->a_void = NULL; curses_add_nhmenu_item(wid, NO_GLYPH, &Id, 0, 0, attr, text, FALSE);
curses_add_nhmenu_item(wid, NO_GLYPH, identifier, 0, 0, attr, text,
FALSE);
} else { } else {
waddstr(win, text); waddstr(win, text);
wnoutrefresh(win); wnoutrefresh(win);