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

follow-up: shorten some lines; add an assert

Browse Source
This commit is contained in:
nhmall
2024-03-31 08:28:50 -04:00
parent 8ccd8b8937
commit a3e9c7db2d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glyphs.c
+7 -4
View File
@@ -52,6 +52,7 @@ staticfn void shuffle_customizations(void);
staticfn void staticfn void
to_custom_symset_entry_callback(int glyph, struct find_struct *findwhat) to_custom_symset_entry_callback(int glyph, struct find_struct *findwhat)
{ {
int idx = gs.symset_which_set;
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
uint8 utf8str[6] = { 0, 0, 0, 0, 0, 0 }; uint8 utf8str[6] = { 0, 0, 0, 0, 0, 0 };
int uval = 0; int uval = 0;
@@ -59,17 +60,19 @@ to_custom_symset_entry_callback(int glyph, struct find_struct *findwhat)
if (findwhat->extraval) if (findwhat->extraval)
*findwhat->extraval = glyph; *findwhat->extraval = glyph;
assert(idx >= 0 && idx < NUM_GRAPHICS);
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
if (findwhat->unicode_val) if (findwhat->unicode_val)
uval = unicode_val(findwhat->unicode_val); uval = unicode_val(findwhat->unicode_val);
if (uval && unicodeval_to_utf8str(uval, utf8str, sizeof utf8str)) { if (uval && unicodeval_to_utf8str(uval, utf8str, sizeof utf8str)) {
add_custom_urep_entry(gs.symset[gs.symset_which_set].name, glyph, uval, utf8str, add_custom_urep_entry(gs.symset[idx].name, glyph, uval,
gs.symset_which_set); utf8str, gs.symset_which_set);
} }
#endif #endif
if (findwhat->color) { if (findwhat->color) {
add_custom_nhcolor_entry(gs.symset[gs.symset_which_set].name, glyph, findwhat->color, add_custom_nhcolor_entry(gs.symset[idx].name, glyph,
gs.symset_which_set); findwhat->color, gs.symset_which_set);
} }
} }