From: nhmall Date: Sat, 7 May 2022 14:40:21 +0000 (-0400) Subject: trailing blank removal X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b7c547dcd309bc061b7d66d2462ee4531862af0;p=nethack trailing blank removal --- diff --git a/src/allmain.c b/src/allmain.c index b379c51cd..e59c372b8 100644 --- a/src/allmain.c +++ b/src/allmain.c @@ -830,7 +830,7 @@ static const struct early_opt earlyopts[] = { #ifndef NODUMPENUMS {ARG_DUMPENUMS, "dumpenums", 9, FALSE}, #ifdef ENHANCED_SYMBOLS - {ARG_DUMPGLYPHIDS, "dumpglyphids", 12, FALSE}, + {ARG_DUMPGLYPHIDS, "dumpglyphids", 12, FALSE}, #endif #endif /* NODUMPENUMS */ #ifdef WIN32 diff --git a/src/display.c b/src/display.c index efe4bf583..2978e3fc4 100644 --- a/src/display.c +++ b/src/display.c @@ -1363,7 +1363,7 @@ see_traps(void) } } -/* glyph, ttychar, { glyphflags, { sym.color, sym.symidx }, +/* glyph, ttychar, { glyphflags, { sym.color, sym.symidx }, tileidx, u } */ static glyph_info no_ginfo = { NO_GLYPH, ' ', { MG_BADXY, { NO_COLOR, 0 }, 0 diff --git a/src/symbols.c b/src/symbols.c index f270f055e..ebc4a5d73 100644 --- a/src/symbols.c +++ b/src/symbols.c @@ -1064,7 +1064,7 @@ find_display_sym_customization(const char *customization_name, { struct symset_customization *gdc = &g.sym_customizations[which_set]; struct customization_detail *symdetails; - if ((gdc->custtype == custom_symbols) + if ((gdc->custtype == custom_symbols) && (strcmp(customization_name, gdc->customization_name) == 0)) { symdetails = gdc->details; while (symdetails) {