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

tidy up glyphs.c a little bit

Browse Source
This commit is contained in:
nhmall
2024-03-24 15:25:57 -04:00
parent 7eecddfdea
commit 17578590ea
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glyphs.c
+3 -23
View File
@@ -5,12 +5,9 @@
#include "hack.h" #include "hack.h"
extern const struct symparse loadsyms[]; extern const struct symparse loadsyms[];
extern glyph_map glyphmap[MAX_GLYPH];
extern struct enum_dump monsdump[]; extern struct enum_dump monsdump[];
extern struct enum_dump objdump[]; extern struct enum_dump objdump[];
extern glyph_map glyphmap[MAX_GLYPH];
extern const char *const known_handling[]; /* symbols.c */
extern glyph_map glyphmap[MAX_GLYPH];
staticfn void shuffle_customizations(void);
#define Fprintf (void) fprintf #define Fprintf (void) fprintf
@@ -42,14 +39,7 @@ static const long nonzero_black = CLR_BLACK | NH_BASIC_COLOR;
staticfn struct customization_detail *find_matching_customization( staticfn struct customization_detail *find_matching_customization(
const char *customization_name, enum customization_types custtype, const char *customization_name, enum customization_types custtype,
enum graphics_sets which_set); enum graphics_sets which_set);
#if 0
staticfn struct customization_detail *find_display_sym_customization(
const char *customization_name, const struct symparse *symparse,
enum graphics_sets which_set);
staticfn struct customization_detail *find_display_urep_customization(
const char *customization_name, int glyphidx,
enum graphics_sets which_set);
#endif
staticfn void init_glyph_cache(void); staticfn void init_glyph_cache(void);
staticfn void add_glyph_to_cache(int glyphnum, const char *id); staticfn void add_glyph_to_cache(int glyphnum, const char *id);
staticfn int find_glyph_in_cache(const char *id); staticfn int find_glyph_in_cache(const char *id);
@@ -59,15 +49,12 @@ staticfn void to_custom_symset_entry_callback(int glyph,
staticfn int parse_id(const char *id, struct find_struct *findwhat); staticfn int parse_id(const char *id, struct find_struct *findwhat);
staticfn int glyph_find_core(const char *id, struct find_struct *findwhat); staticfn int glyph_find_core(const char *id, struct find_struct *findwhat);
staticfn char *fix_glyphname(char *str); staticfn char *fix_glyphname(char *str);
staticfn void shuffle_customizations(void);
/* staticfn void purge_custom_entries(enum graphics_sets which_set); */ /* staticfn void purge_custom_entries(enum graphics_sets which_set); */
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)
{ {
#if 0
glyph_map *gmap = &glyphmap[glyph];
#endif
#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;
@@ -517,13 +504,6 @@ add_custom_nhcolor_entry(
sizeof (struct customization_detail)); sizeof (struct customization_detail));
newdetails->content.urep.glyphidx = glyphidx; newdetails->content.urep.glyphidx = glyphidx;
newdetails->content.ccolor.nhcolor = nhcolor; newdetails->content.ccolor.nhcolor = nhcolor;
#if 0
if ((nhcolor & NH_BASIC_COLOR) != 0) {
newdetails->content.ccolor.nhcolor = nhcolor;
} else {
newdetails->content.ccolor.nhcolor = nhcolor;
}
#endif
newdetails->next = (struct customization_detail *) 0; newdetails->next = (struct customization_detail *) 0;
if (gdc->details == NULL) { if (gdc->details == NULL) {
gdc->details = newdetails; gdc->details = newdetails;