a couple of display.c follow-up bits

This commit is contained in:
nhmall
2021-01-05 16:06:04 -05:00
parent 2d1cf9591f
commit b0a366d0ae
+4 -6
View File
@@ -2161,10 +2161,8 @@ glyph_info *glyphinfo;
do_mon_checks = FALSE; do_mon_checks = FALSE;
if (x < 0 || y < 0 || x >= COLNO || y >= ROWNO) { if (x < 0 || y < 0 || x >= COLNO || y >= ROWNO) {
glyphinfo->glyph = NO_GLYPH; *glyphinfo = nul_glyphinfo;
glyphinfo->glyphflags = MG_BADXY; glyphinfo->glyphflags |= MG_BADXY;
glyphinfo->color = NO_COLOR;
glyphinfo->ttychar = ' ';
return; return;
} }
@@ -2437,8 +2435,6 @@ glyph_info *glyphinfo;
} }
} }
glyphinfo->symidx = idx;
glyphinfo->ttychar = g.showsyms[idx];
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
/* Turn off color if no color defined, or rogue level w/o PC graphics. */ /* Turn off color if no color defined, or rogue level w/o PC graphics. */
if (!has_color(color) if (!has_color(color)
@@ -2446,6 +2442,8 @@ glyph_info *glyphinfo;
#endif #endif
color = NO_COLOR; color = NO_COLOR;
glyphinfo->color = color; glyphinfo->color = color;
glyphinfo->symidx = idx;
glyphinfo->ttychar = g.showsyms[idx];
glyphinfo->glyphflags = special; glyphinfo->glyphflags = special;
glyphinfo->glyph = glyph; glyphinfo->glyph = glyph;
} }