diff options
| -rw-r--r-- | gfx.c | 7 | ||||
| -rw-r--r-- | table/palettes.h | 22 |
2 files changed, 25 insertions, 4 deletions
@@ -475,7 +475,7 @@ void DrawFrameRect(int left, int top, int right, int bottom, int ctab, int flags int DoDrawString(const byte *string, int x, int y, byte color) { DrawPixelInfo *dpi = _cur_dpi; int base = _stringwidth_base; - byte c, *b; + byte c; int xo = x, yo = y; if (color != 0xFE) { @@ -487,9 +487,8 @@ int DoDrawString(const byte *string, int x, int y, byte color) { if (color != 0xFF) { switch_color:; - b = GetSpritePtr(674); - _string_colorremap[1] = b[color*2+8]; - _string_colorremap[2] = b[color*2+9]; + _string_colorremap[1] = StringColormap[color][0]; + _string_colorremap[2] = StringColormap[color][1]; _color_remap_ptr = _string_colorremap; } } diff --git a/table/palettes.h b/table/palettes.h index fd4a77f38..184a2a495 100644 --- a/table/palettes.h +++ b/table/palettes.h @@ -94,3 +94,25 @@ static const ExtraPaletteValues _extra_palette_values = { 92,164,184, 92,164,184,116,180,196,148,200,216,180,220,232}, }; +// Color table for colors in lang files (e.g. {BLACK}) +// 1st color: text +// 2nd color: shadow +static const byte StringColormap[17][2] = { + { 150, 215 }, // BLUE + { 12, 215 }, // SILVER + { 189, 215 }, // GOLD + { 184, 215 }, // RED + { 174, 215 }, // PURPLE + { 30, 215 }, // LTBROWN + { 195, 215 }, // ORANGE + { 209, 215 }, // GREEN + { 68, 215 }, // YELLOW + { 95, 215 }, // DKGREEN + { 79, 215 }, // CREAM + { 116, 215 }, // BROWN + { 15, 215 }, // WHITE + { 152, 215 }, // LTBLUE + { 32, 215 }, // GRAY + { 133, 215 }, // DKBLUE + { 215, 0 }, // BLACK +}; |