Experiment with different effect for weapon silhouettes

bradharding · Aug 31, 2024 · 0333334 · 0333334
1 parent 5586d7f
commit 0333334
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
@@ -813,7 +813,6 @@ static bool HU_DefaultPistolSprites(void)
     }
 
     if (!result1)
-    {
         for (int i = 0; i < 5; i++)
         {
             patch_t *patch = patch = W_CacheLumpNum(firstspritelump
@@ -828,7 +827,6 @@ static bool HU_DefaultPistolSprites(void)
                 break;
             }
         }
-    }
 
     return (result1 || result2);
 }
@@ -1344,7 +1342,7 @@ static void HU_DrawAltHUD(void)
             althudfunc(ALTHUD_RIGHT_X, ALTHUD_Y + 13, altrightpatch, WHITE, color, tinttab60);
 
         if ((patch = weaponinfo[weapon].weaponpatch))
-            althudweaponfunc(ALTHUD_RIGHT_X + 108, weaponinfo[weapon].weapony, patch, color, tinttab60);
+            althudweaponfunc(ALTHUD_RIGHT_X + 108, weaponinfo[weapon].weapony, patch, color, tinttab70);
 
         for (int i = 1; i <= NUMCARDS; i++)
             for (int j = 0; j < NUMCARDS; j++)

diff --git a/src/i_colors.c b/src/i_colors.c
@@ -129,6 +129,7 @@ byte    *gold4;
 byte    *white5;
 byte    *white25;
 byte    *white33;
+byte    *white75;
 
 int FindNearestColor(byte *palette, const byte red, const byte green, const byte blue)
 {
@@ -185,6 +186,7 @@ void FindNearestColors(byte *palette)
     white5 = &tinttab5[nearestwhite << 8];
     white25 = &tinttab25[nearestwhite << 8];
     white33 = &tinttab33[nearestwhite << 8];
+    white75 = &tinttab75[nearestwhite << 8];
 }
 
 int FindBrightDominantColor(patch_t *patch)

diff --git a/src/i_colors.h b/src/i_colors.h
@@ -113,6 +113,7 @@ extern byte *gold4;
 extern byte *white5;
 extern byte *white25;
 extern byte *white33;
+extern byte *white75;
 
 void I_InitTintTables(byte *palette);
 int FindNearestColor(byte *palette, const byte red, const byte green, const byte blue);

diff --git a/src/v_video.c b/src/v_video.c
@@ -882,7 +882,6 @@ void V_DrawHUDPatch(int x, int y, patch_t *patch, const byte *tinttab)
     for (int col = 0; col < width; col++, desttop++)
     {
         column_t    *column = (column_t *)((byte *)patch + LONG(patch->columnoffset[col]));
-        int         yy = y;
 
         // step through the posts in a column
         while (column->topdelta != 0xFF)
@@ -896,9 +895,6 @@ void V_DrawHUDPatch(int x, int y, patch_t *patch, const byte *tinttab)
             {
                 *dest = *source++;
                 dest += SCREENWIDTH;
-
-                if (++yy == SCREENHEIGHT)
-                    break;
             }
 
             column = (column_t *)((byte *)column + length + 4);
@@ -974,7 +970,6 @@ void V_DrawTranslucentHUDPatch(int x, int y, patch_t *patch, const byte *tinttab
     for (int col = 0; col < width; col++, desttop++)
     {
         column_t    *column = (column_t *)((byte *)patch + LONG(patch->columnoffset[col]));
-        int         yy = y;
 
         // step through the posts in a column
         while (column->topdelta != 0xFF)
@@ -988,9 +983,6 @@ void V_DrawTranslucentHUDPatch(int x, int y, patch_t *patch, const byte *tinttab
             {
                 *dest = tinttab[(*source++ << 8) + *dest];
                 dest += SCREENWIDTH;
-
-                if (++yy == SCREENHEIGHT)
-                    break;
             }
 
             column = (column_t *)((byte *)column + length + 4);
@@ -1036,21 +1028,28 @@ void V_DrawHUDWeaponPatch(int x, int y, patch_t *patch, int color, const byte *t
     for (int col = 0; col < width; col++, desttop--)
     {
         column_t    *column = (column_t *)((byte *)patch + LONG(patch->columnoffset[col]));
+        int         yy = y;
 
         if (x + width - col >= SCREENWIDTH)
             continue;
 
         // step through the posts in a column
         while (column->topdelta != 0xFF)
         {
+            byte        *source = (byte *)column + 3;
             byte        *dest = &desttop[column->topdelta * SCREENWIDTH];
             const byte  length = column->length;
             byte        count = length;
 
             while (count-- > 0)
             {
-                *dest = color;
+                const byte  dot = *source++;
+
+                *dest = white75[grays[dot]];
                 dest += SCREENWIDTH;
+
+                if (++yy == SCREENHEIGHT)
+                    break;
             }
 
             column = (column_t *)((byte *)column + length + 4);
@@ -1066,21 +1065,28 @@ void V_DrawTranslucentHUDWeaponPatch(int x, int y, patch_t *patch, int color, co
     for (int col = 0; col < width; col++, desttop--)
     {
         column_t    *column = (column_t *)((byte *)patch + LONG(patch->columnoffset[col]));
+        int         yy = y;
 
         if (x + width - col >= SCREENWIDTH)
             continue;
 
         // step through the posts in a column
         while (column->topdelta != 0xFF)
         {
+            byte        *source = (byte *)column + 3;
             byte        *dest = &desttop[column->topdelta * SCREENWIDTH];
             const byte  length = column->length;
             byte        count = length;
 
             while (count-- > 0)
             {
-                *dest = tinttab[(color << 8) + *dest];
+                const byte  dot = *source++;
+
+                *dest = tinttab[(white75[grays[dot]] << 8) + *dest];
                 dest += SCREENWIDTH;
+
+                if (++yy == SCREENHEIGHT)
+                    break;
             }
 
             column = (column_t *)((byte *)column + length + 4);