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

tty perm_invent bits

Browse Source 
Mostly comments.
This commit is contained in:
PatR
2022-06-23 16:10:17 -07:00
parent d8377fe091
commit 38433b4075
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
win/tty/wintty.c
View File

@@ -545,6 +545,11 @@ tty_preference_update(const char *pref)
genl_preference_update(pref); genl_preference_update(pref);
#endif #endif
#ifdef TTY_PERM_INVENT #ifdef TTY_PERM_INVENT
/* the boundary box around persistent inventory is drawn with wall
symbols, so if player changes to a different symbol set (other
than temporary switch to the rogue one), redraw perm_invent; not
only might individual symbols change (punctuation vs line drawing),
the way to render them might change too (Handling: DEC/UTF8/&c) */
if (!strcmp(pref, "symset") && iflags.window_inited) { if (!strcmp(pref, "symset") && iflags.window_inited) {
if (g.tty_invent_win != WIN_ERR) if (g.tty_invent_win != WIN_ERR)
tty_invent_box_glyph_init(wins[g.tty_invent_win]); tty_invent_box_glyph_init(wins[g.tty_invent_win]);
@@ -1686,7 +1691,7 @@ ttyinv_create_window(int newid, struct WinDesc *newwin)
Qt's "paper doll" adds first lit lamp/candle and first active Qt's "paper doll" adds first lit lamp/candle and first active
leash; those aren't tracked via owornmask so we don't notice them */ leash; those aren't tracked via owornmask so we don't notice them */
if ((ttyinvmode & InvInUse) != 0) if ((ttyinvmode & InvInUse) != 0)
minrow = 1 + 15 + 1; /* top border + 15 lines + border border */ minrow = 1 + 15 + 1; /* top border + 15 lines + bottom border */
if (newwin->rows < minrow || newwin->cols < tty_pi_mincol) { if (newwin->rows < minrow || newwin->cols < tty_pi_mincol) {
tty_destroy_nhwindow(newid); /* sets g.tty_invent_win to WIN_ERR */ tty_destroy_nhwindow(newid); /* sets g.tty_invent_win to WIN_ERR */
@@ -3620,10 +3625,10 @@ tty_update_invent_slot(
and left/right panel, truncating if long or padding with spaces if short */ and left/right panel, truncating if long or padding with spaces if short */
static void static void
ttyinv_populate_slot( ttyinv_populate_slot(
struct WinDesc *cw, struct WinDesc *cw,
int row, /* 'row' within the window, not within screen */ int row, /* 'row' within the window, not within screen */
int side, /* 'side'==0 is left panel or ==1 is right panel */ int side, /* 'side'==0 is left panel or ==1 is right panel */
const char *text) const char *text)
{ {
struct tty_perminvent_cell *cell; struct tty_perminvent_cell *cell;
char c; char c;
@@ -3633,6 +3638,14 @@ ttyinv_populate_slot(
endcol = bordercol[side + 1] - 1; endcol = bordercol[side + 1] - 1;
cell = &cw->cells[row][col]; cell = &cw->cells[row][col];
for (ccnt = col; ccnt <= endcol; ++ccnt, ++cell) { for (ccnt = col; ccnt <= endcol; ++ccnt, ++cell) {
/* [don't expect this to happen] if there was a glyph here, release
memory allocated for it; gi pointer and ttychar character overlay
each other in a union, so clear gi before assigning ttychar */
if (cell->glyph) {
free((genericptr_t) cell->content.gi), cell->content.gi = 0;
cell->glyph = 0; /* cell->content.gi is gone */
}
if ((c = *text) != '\0') { if ((c = *text) != '\0') {
if (cell->content.ttychar != c) if (cell->content.ttychar != c)
cell->refresh = 1; cell->refresh = 1;
@@ -3643,8 +3656,7 @@ ttyinv_populate_slot(
cell->refresh = 1; cell->refresh = 1;
cell->content.ttychar = ' '; cell->content.ttychar = ' ';
} }
cell->text = 1; cell->text = 1; /* cell->content.ttychar is current */
cell->glyph = 0;
} }
} }