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-10 00:08:07 -05:00
parent 0d63372a48 7f5ce35dae
commit 7d703fa978
8 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win/curses/cursmain.c
View File

@@ -75,7 +75,7 @@ struct window_procs curses_procs = {
genl_getmsghistory,
genl_putmsghistory,
curses_status_init,
genl_status_finish,
curses_status_finish,
genl_status_enablefield,
curses_status_update,
genl_can_suspend_yes,

7
win/curses/cursstat.c
View File

@@ -58,15 +58,16 @@ curses_status_init()
}
void
curses_teardown_status()
curses_status_finish()
{
#ifdef STATUS_HILITES
int i;
for (i = 0; i < MAXBLSTATS; ++i) {
free(status_vals_long[i]);
status_vals_long[i] = (char *) 0;
if (status_vals_long[i])
free(status_vals_long[i]), status_vals_long[i] = (char *) 0;
}
genl_status_finish();
#endif /* STATUS_HILITES */
return;
}

4
win/curses/curswins.c
View File

@@ -313,9 +313,7 @@ curses_del_nhwin(winid wid)
return;
}
if (wid == MESSAGE_WIN) {
curses_teardown_messages();
} else if (wid == STATUS_WIN) {
curses_teardown_status();
curses_teardown_messages();
}
nhwins[wid].curwin = NULL;
nhwins[wid].nhwin = -1;

4
win/tty/wintty.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 wintty.c $NHDT-Date: 1549333450 2019/02/05 02:24:10 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.194 $ */
/* NetHack 3.6 wintty.c $NHDT-Date: 1549755185 2019/02/09 23:33:05 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.195 $ */
/* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */
@@ -1524,7 +1524,7 @@ boolean free_data;
tty_menu_item *temp;
while ((temp = cw->mlist) != 0) {
cw->mlist = cw->mlist->next;
cw->mlist = temp->next;
if (temp->str)
free((genericptr_t) temp->str);
free((genericptr_t) temp);