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

rgbstr_to_uint32() -> rgbstr_to_int32()

Browse Source 
Closes #756
This commit is contained in:
nhmall
2022-05-09 07:31:30 -04:00
parent da83c9324a
commit 0aaa114a46
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utf8map.c
+4 -4
View File
@@ -41,7 +41,7 @@ static int unicode_val(const char *cp);
static int parse_id(const char *id, struct find_struct *findwhat); static int parse_id(const char *id, struct find_struct *findwhat);
static int glyph_find_core(const char *id, struct find_struct *findwhat); static int glyph_find_core(const char *id, struct find_struct *findwhat);
static char *fix_glyphname(char *str); static char *fix_glyphname(char *str);
static uint32_t rgbstr_to_uint32(const char *rgbstr); static int32_t rgbstr_to_int32(const char *rgbstr);
boolean closest_color(uint32_t lcolor, uint32_t *closecolor, int *clridx); boolean closest_color(uint32_t lcolor, uint32_t *closecolor, int *clridx);
static void static void
@@ -114,7 +114,7 @@ glyphrep_to_custom_map_entries(const char *op, int *glyphptr)
if (c_unicode && (*c_unicode == 'U' || *c_unicode == 'u') if (c_unicode && (*c_unicode == 'U' || *c_unicode == 'u')
&& (c_unicode[1] == '+')) { && (c_unicode[1] == '+')) {
/* unicode = unicode_val(c_unicode); */ /* unicode = unicode_val(c_unicode); */
if ((rgb = rgbstr_to_uint32(c_rgb)) != -1L || !c_rgb) { if ((rgb = rgbstr_to_int32(c_rgb)) != -1L || !c_rgb) {
to_custom_symbol_find.unicode_val = c_unicode; to_custom_symbol_find.unicode_val = c_unicode;
/* if the color 0 is an actual color, as opposed to just "not set" /* if the color 0 is an actual color, as opposed to just "not set"
we set a marker bit outside the 24-bit range to indicate a we set a marker bit outside the 24-bit range to indicate a
@@ -134,8 +134,8 @@ glyphrep_to_custom_map_entries(const char *op, int *glyphptr)
return 0; return 0;
} }
static uint32_t static int32_t
rgbstr_to_uint32(const char *rgbstr) rgbstr_to_int32(const char *rgbstr)
{ {
int r, gn, b, milestone = 0; int r, gn, b, milestone = 0;
char *cp, *c_r,*c_g,*c_b; char *cp, *c_r,*c_g,*c_b;