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

keep perm_invent option

Browse Source 
Make it apparent why tty perm_invent can't be set in-game
if the terminal cannot support it.
This commit is contained in:
nhmall
2022-06-20 13:43:50 -04:00
parent cb0dd7af3f
commit 8fca10029a
3 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
win/tty/wintty.c
View File

@@ -1623,31 +1623,27 @@ tty_create_nhwindow(int type)
newwin->datlen = (short *) 0;
newwin->cells = (struct tty_perminvent_cell **) 0;
if ((newwin->rows < tty_pi_minrow) || (newwin->cols < tty_pi_mincol)) {
if (newwin->rows < tty_pi_minrow) {
tty_destroy_nhwindow(newid);
if (iflags.perm_invent) {
raw_printf("tty perm_invent has been disabled.");
raw_printf(
"tty perm_invent requires %d rows, your terminal has %d.",
(iflags.wc2_statuslines > 2) ? 54 : 53, ttyDisplay->rows);
iflags.perm_invent = FALSE;
}
return WIN_ERR;
} else if (newwin->cols < tty_pi_mincol) {
tty_destroy_nhwindow(newid);
if (iflags.perm_invent) {
raw_printf("tty perm_invent has been disabled.");
raw_printf(
"tty perm_invent requires %d columns, your terminal has %d.",
tty_pi_mincol, ttyDisplay->cols);
iflags.perm_invent = FALSE;
if (!g.program_state.beyond_savefile_load)
raw_printf("tty perm_invent could not be enabled.");
if (newwin->rows < tty_pi_minrow)
raw_printf(
"tty perm_invent requires %d rows, your terminal has %d.",
(iflags.wc2_statuslines > 2) ? 54 : 53,
ttyDisplay->rows);
else
raw_printf(
"tty perm_invent requires %d columns, your terminal has %d.",
tty_pi_mincol, ttyDisplay->cols);
}
set_option_mod_status("perm_invent", set_gameview);
iflags.perm_invent = FALSE;
return WIN_ERR;
} else {
int r, c;
iflags.perm_invent = TRUE;
newwin->maxrow = tty_pi_minrow;
newwin->maxcol = newwin->cols;
/* establish the borders */