ENHANCED_SYMBOLS: store all CLR_ colors specially

The 0x1000000 bit (NH_BASIC_COLOR bit) was used to mark
CLR_BLACK when storing it in u->ucolor. Now, all of the basic CLR_*
colors are stored that way.

The NH_BASIC_COLOR bit indicates that the value in u->ucolor is
not an rgb value, rather it is one of the 0-15 basic NetHack colors.
The window-ports need to strip the NH_BASIC_COLOR bit off before using
it for color changes.
This commit is contained in:
nhmall
2024-03-03 18:31:11 -05:00
parent 3fb35e390b
commit 6619d10d90
10 changed files with 103 additions and 69 deletions
+22 -22
View File
@@ -629,28 +629,28 @@ start: Enhanced1
S_expl_ml: U+258f # LEFT ONE EIGHTH BLOCK
S_expl_mr: U+2595 # RIGHT ONE EIGHTH BLOCK
S_expl_bc: U+2581 # LOWER ONE EIGHTH BLOCK
G_vwall_sokoban: U+2502/0-0-190
G_hwall_sokoban: U+2500/0-0-190
G_tlcorn_sokoban: U+250c/0-0-190
G_trcorn_sokoban: U+2510/0-0-190
G_blcorn_sokoban: U+2514/0-0-190
G_brcorn_sokoban: U+2518/0-0-190
G_crwall_sokoban: U+253C/0-0-190
G_tuwall_sokoban: U+2534/0-0-190
G_tdwall_sokoban: U+252C/0-0-190
G_tlwall_sokoban: U+2524/0-0-190
G_trwall_sokoban: U+251C/0-0-190
G_vwall_gehennom: U+2502/190-0-0
G_hwall_gehennom: U+2500/190-0-0
G_tlcorn_gehennom: U+250c/190-0-0
G_trcorn_gehennom: U+2510/190-0-0
G_blcorn_gehennom: U+2514/190-0-0
G_brcorn_gehennom: U+2518/190-0-0
G_crwall_gehennom: U+253C/190-0-0
G_tuwall_gehennom: U+2534/190-0-0
G_tdwall_gehennom: U+252C/190-0-0
G_tlwall_gehennom: U+2524/190-0-0
G_trwall_gehennom: U+251C/190-0-0
G_vwall_sokoban: U+2502/blue
G_hwall_sokoban: U+2500/blue
G_tlcorn_sokoban: U+250c/blue
G_trcorn_sokoban: U+2510/blue
G_blcorn_sokoban: U+2514/blue
G_brcorn_sokoban: U+2518/blue
G_crwall_sokoban: U+253C/blue
G_tuwall_sokoban: U+2534/blue
G_tdwall_sokoban: U+252C/blue
G_tlwall_sokoban: U+2524/blue
G_trwall_sokoban: U+251C/blue
G_vwall_gehennom: U+2502/red
G_hwall_gehennom: U+2500/red
G_tlcorn_gehennom: U+250c/red
G_trcorn_gehennom: U+2510/red
G_blcorn_gehennom: U+2514/red
G_brcorn_gehennom: U+2518/red
G_crwall_gehennom: U+253C/red
G_tuwall_gehennom: U+2534/red
G_tdwall_gehennom: U+252C/red
G_tlwall_gehennom: U+2524/red
G_trwall_gehennom: U+251C/red
G_vwall_knox: U+2502/150-75-0
G_hwall_knox: U+2500/150-75-0
G_tlcorn_knox: U+250c/150-75-0