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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-10-23 08:46:39 -04:00
parent 8df0a63938 b7ca0b4cc6
commit 79db36b455
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
win/tty/wintty.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 wintty.c $NHDT-Date: 1558400902 2019/05/21 01:08:22 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.209 $ */
/* NetHack 3.6 wintty.c $NHDT-Date: 1571787079 2019/10/22 23:31:19 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.223 $ */
/* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */
@@ -133,7 +133,6 @@ struct window_procs tty_procs = {
genl_can_suspend_yes,
};
static int maxwin = 0; /* number of windows in use */
winid BASE_WINDOW;
struct WinDesc *wins[MAXWIN];
struct DisplayDesc *ttyDisplay; /* the tty display descriptor */
@@ -1418,10 +1417,18 @@ int type;
int i, rowoffset;
int newid;
if (maxwin == MAXWIN)
for (newid = 0; newid < MAXWIN; ++newid)
if (wins[newid] == 0)
break;
if (newid == MAXWIN) {
panic("No window slots!");
/*NOTREACHED*/
return WIN_ERR;
}
newwin = (struct WinDesc *) alloc(sizeof (struct WinDesc));
wins[newid] = newwin;
newwin = (struct WinDesc *) alloc(sizeof(struct WinDesc));
newwin->type = type;
newwin->flags = 0;
newwin->active = FALSE;
@@ -1488,17 +1495,7 @@ int type;
break;
default:
panic("Tried to create window type %d\n", (int) type);
return WIN_ERR;
}
for (newid = 0; newid < MAXWIN; newid++) {
if (wins[newid] == 0) {
wins[newid] = newwin;
break;
}
}
if (newid == MAXWIN) {
panic("No window slots!");
/*NOTREACHED*/
return WIN_ERR;
}
@@ -2445,7 +2442,7 @@ winid window;
free_window_info(cw, TRUE);
free((genericptr_t) cw);
wins[window] = 0;
wins[window] = 0; /* available for re-use */
}
void