Cast slightly darker shadow on menu highlight

bradharding · Aug 29, 2023 · e68d919 · e68d919
1 parent 4f808a2
commit e68d919
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/i_colors.c b/src/i_colors.c
@@ -81,6 +81,7 @@ byte    *tinttab25;
 byte    *tinttab30;
 byte    *tinttab33;
 byte    *tinttab40;
+byte    *tinttab45;
 byte    *tinttab50;
 byte    *tinttab60;
 byte    *tinttab66;
@@ -115,6 +116,7 @@ byte    nearestwhite;
 
 byte    *black25;
 byte    *black40;
+byte    *black45;
 byte    *white5;
 byte    *white25;
 byte    *white33;
@@ -169,6 +171,7 @@ void FindNearestColors(byte *palette)
 
     black25 = &tinttab25[nearestblack << 8];
     black40 = &tinttab40[nearestblack << 8];
+    black45 = &tinttab45[nearestblack << 8];
     white5 = &tinttab5[nearestwhite << 8];
     white25 = &tinttab25[nearestwhite << 8];
     white33 = &tinttab33[nearestwhite << 8];
@@ -334,6 +337,7 @@ void I_InitTintTables(byte *palette)
     tinttab30 = GenerateTintTable(palette, 30, ALL);
     tinttab33 = GenerateTintTable(palette, 33, ALL);
     tinttab40 = GenerateTintTable(palette, 40, ALL);
+    tinttab45 = GenerateTintTable(palette, 45, ALL);
     tinttab50 = GenerateTintTable(palette, 50, ALL);
     tinttab60 = GenerateTintTable(palette, 60, ALL);
     tinttab66 = GenerateTintTable(palette, 66, ALL);

diff --git a/src/i_colors.h b/src/i_colors.h
@@ -71,6 +71,7 @@ extern byte *tinttab25;
 extern byte *tinttab30;
 extern byte *tinttab33;
 extern byte *tinttab40;
+extern byte *tinttab45;
 extern byte *tinttab50;
 extern byte *tinttab60;
 extern byte *tinttab66;
@@ -104,6 +105,7 @@ extern byte nearestwhite;
 
 extern byte *black25;
 extern byte *black40;
+extern byte *black45;
 extern byte *white5;
 extern byte *white25;
 extern byte *white33;

diff --git a/src/v_video.c b/src/v_video.c
@@ -845,6 +845,7 @@ void V_DrawTranslucentAltHUDText(int x, int y, byte *screen, patch_t *patch,
 void V_DrawMenuPatch(int x, int y, patch_t *patch, bool highlight, int shadowwidth)
 {
     byte        *desttop;
+    const byte  *black = (highlight ? black45 : black40);
     const int   width = SHORT(patch->width) << FRACBITS;
 
     y -= SHORT(patch->topoffset);
@@ -885,7 +886,7 @@ void V_DrawMenuPatch(int x, int y, patch_t *patch, bool highlight, int shadowwid
                     byte    *dot = dest + SCREENWIDTH + 2;
 
                     if (i <= shadowwidth && *dot != 47 && *dot != 191)
-                        *dot = black40[*dot];
+                        *dot = black[*dot];
                 }
 
                 srccol += DYI;
@@ -1554,15 +1555,16 @@ void V_DrawPixel(int x, int y, byte color, bool highlight, bool shadow)
     {
         if (shadow)
         {
-            byte    *dot = *screens + ((size_t)y * SCREENWIDTH + x) * 2;
+            byte        *dot = *screens + ((size_t)y * SCREENWIDTH + x) * 2;
+            const byte  *black = (highlight ? black45 : black40);
 
-            *dot = black40[*dot];
+            *dot = black[*dot];
             dot++;
-            *dot = black40[*dot];
+            *dot = black[*dot];
             dot += SCREENWIDTH;
-            *dot = black40[*dot];
+            *dot = black[*dot];
             dot--;
-            *dot = black40[*dot];
+            *dot = black[*dot];
         }
     }
     else if (color && color != 32)