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

deal with added field in shuffle_customizations()

Browse Source
This commit is contained in:
nhmall
2024-03-25 00:15:06 -04:00
parent e3409fd4af
commit dc7df7c407
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/glyphs.c
View File

@@ -569,6 +569,8 @@ shuffle_customizations(void)
struct unicode_representation *tmp_u[NUM_OBJECTS]; struct unicode_representation *tmp_u[NUM_OBJECTS];
#endif #endif
uint32 tmp_customcolor[NUM_OBJECTS]; uint32 tmp_customcolor[NUM_OBJECTS];
uint16 tmp_color256idx[NUM_OBJECTS];
int duplicate[NUM_OBJECTS]; int duplicate[NUM_OBJECTS];
for (i = 0; i < NUM_OBJECTS; i++) { for (i = 0; i < NUM_OBJECTS; i++) {
@@ -577,6 +579,7 @@ shuffle_customizations(void)
tmp_u[i] = (struct unicode_representation *) 0; tmp_u[i] = (struct unicode_representation *) 0;
#endif #endif
tmp_customcolor[i] = 0; tmp_customcolor[i] = 0;
tmp_color256idx[i] = 0;
} }
for (i = 0; i < NUM_OBJECTS; i++) { for (i = 0; i < NUM_OBJECTS; i++) {
int idx = objects[i].oc_descr_idx; int idx = objects[i].oc_descr_idx;
@@ -592,8 +595,10 @@ shuffle_customizations(void)
struct unicode_representation *other = tmp_u[duplicate[idx]]; struct unicode_representation *other = tmp_u[duplicate[idx]];
#endif #endif
uint32 other_customcolor = tmp_customcolor[duplicate[idx]]; uint32 other_customcolor = tmp_customcolor[duplicate[idx]];
uint16 other_color256idx = tmp_color256idx[duplicate[idx]];
tmp_customcolor[i] = other_customcolor; tmp_customcolor[i] = other_customcolor;
tmp_color256idx[i] = other_color256idx;
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
tmp_u[i] = (struct unicode_representation *) tmp_u[i] = (struct unicode_representation *)
alloc(sizeof *tmp_u[i]); alloc(sizeof *tmp_u[i]);
@@ -605,6 +610,7 @@ shuffle_customizations(void)
#endif #endif
} else { } else {
tmp_customcolor[i] = obj_glyphs[idx].customcolor; tmp_customcolor[i] = obj_glyphs[idx].customcolor;
tmp_color256idx[i] = obj_glyphs[idx].color256idx;
#ifdef ENHANCED_SYMBOLS #ifdef ENHANCED_SYMBOLS
tmp_u[i] = obj_glyphs[idx].u; tmp_u[i] = obj_glyphs[idx].u;
#endif #endif
@@ -618,6 +624,7 @@ shuffle_customizations(void)
obj_glyphs[idx].u = NULL; obj_glyphs[idx].u = NULL;
#endif #endif
obj_glyphs[idx].customcolor = 0; obj_glyphs[idx].customcolor = 0;
obj_glyphs[idx].color256idx = 0;
} }
} }
} }
@@ -631,6 +638,7 @@ shuffle_customizations(void)
obj_glyphs[i].u = tmp_u[i]; obj_glyphs[i].u = tmp_u[i];
#endif #endif
obj_glyphs[i].customcolor = tmp_customcolor[i]; obj_glyphs[i].customcolor = tmp_customcolor[i];
obj_glyphs[i].color256idx = tmp_color256idx[i];
} }
} }
} }