From bd67f3d0d6507798fa36de92f36a7bbb51ce11eb Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 25 May 2026 15:33:54 -0400 Subject: [PATCH] merge bit --- src/glyphs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/glyphs.c b/src/glyphs.c index 5c49d89a4..837190caf 100644 --- a/src/glyphs.c +++ b/src/glyphs.c @@ -291,7 +291,8 @@ compose_glyph_name(int glyph, char *buf, size_t bufsz) ? obj_descr[i].oc_name : obj_descr[i].oc_descr; Strcpy(buf, "G_"); - if (glyph_is_normal_piletop_obj(glyph)) + if (glyph_is_normal_piletop_obj(glyph) + || glyph_is_piletop_generic_obj(glyph)) Strcat(buf, "piletop_"); Strcat(buf, buf2); Strcat(buf, buf3); @@ -1046,8 +1047,6 @@ parse_id( findwhat->val = val; findwhat->loadsyms_offset = 0; return 1; - if (glyph_is_normal_piletop_obj(glyph) - || glyph_is_piletop_generic_obj(glyph)) } } return 0;