bundle the display-related hints, that tell bot() and others

that an update is required, into a struct. Remove it from
context since there is no reason to save those.
This commit is contained in:
nhmall
2024-01-04 23:16:27 -05:00
parent 9bcff7b896
commit 22e52ee905
46 changed files with 246 additions and 238 deletions

View File

@@ -1067,11 +1067,11 @@ tty_clear_nhwindow(winid window)
cw->data[i][n - 1] = '\0';
/*finalx[i][NOW] = finalx[i][BEFORE] = 0;*/
}
gc.context.botlx = 1;
display.botlx = 1;
break;
case NHW_MAP:
/* cheap -- clear the whole thing and tell nethack to redraw botl */
gc.context.botlx = 1;
display.botlx = 1;
/*FALLTHRU*/
case NHW_BASE:
/* if erasing_tty_screen is True, calling sequence is
@@ -2259,7 +2259,7 @@ tty_putstr(winid window, int attr, const char *str)
#ifndef STATUS_HILITES
case NHW_STATUS:
ob = &cw->data[cw->cury][j = cw->curx];
if (gc.context.botlx)
if (display.botlx)
*ob = '\0';
if (!cw->cury && (int) strlen(str) >= CO) {
/* the characters before "St:" are unnecessary */
@@ -2270,7 +2270,7 @@ tty_putstr(winid window, int attr, const char *str)
nb = str;
for (i = cw->curx + 1, n0 = cw->cols; i < n0; i++, nb++) {
if (!*nb) {
if (*ob || gc.context.botlx) {
if (*ob || display.botlx) {
/* last char printed may be in middle of line */
tty_curs(WIN_STATUS, i, cw->cury);
cl_end();
@@ -3653,7 +3653,7 @@ docorner(
if (ymax >= (int) wins[WIN_STATUS]->offy
&& !ystart_between_menu_pages) {
/* we have wrecked the bottom line */
gc.context.botlx = 1;
display.botlx = 1;
bot();
}
}