Skip to content
Snippets Groups Projects
Commit f5332ccf authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Fixed TC_RAINBOW so it doesn't accept invalid colors, whoopsies

parent 0685b970
Branches
Tags
No related merge requests found
...@@ -527,12 +527,18 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U ...@@ -527,12 +527,18 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
{ {
switch (skinnum) switch (skinnum)
{ {
case TC_RAINBOW:
R_RainbowColormap(dest_colormap, color);
return;
case TC_ALLWHITE: case TC_ALLWHITE:
memset(dest_colormap, 0, NUM_PALETTE_ENTRIES * sizeof(UINT8)); memset(dest_colormap, 0, NUM_PALETTE_ENTRIES * sizeof(UINT8));
return; return;
case TC_RAINBOW:
if (color >= MAXTRANSLATIONS)
I_Error("Invalid skin color #%hu.", (UINT16)color);
if (color != SKINCOLOR_NONE)
{
R_RainbowColormap(dest_colormap, color);
return;
}
break;
case TC_BLINK: case TC_BLINK:
if (color >= MAXTRANSLATIONS) if (color >= MAXTRANSLATIONS)
I_Error("Invalid skin color #%hu.", (UINT16)color); I_Error("Invalid skin color #%hu.", (UINT16)color);
...@@ -541,21 +547,20 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U ...@@ -541,21 +547,20 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
memset(dest_colormap, Color_Index[color-1][3], NUM_PALETTE_ENTRIES * sizeof(UINT8)); memset(dest_colormap, Color_Index[color-1][3], NUM_PALETTE_ENTRIES * sizeof(UINT8));
return; return;
} }
/* FALLTHRU */ break;
case TC_BOSS:
case TC_METALSONIC:
default: default:
for (i = 0; i < NUM_PALETTE_ENTRIES; i++) break;
dest_colormap[i] = (UINT8)i; }
// White! for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
if (skinnum == TC_BOSS) dest_colormap[i] = (UINT8)i;
dest_colormap[31] = 0;
else if (skinnum == TC_METALSONIC)
dest_colormap[159] = 0;
return; // White!
} if (skinnum == TC_BOSS)
dest_colormap[31] = 0;
else if (skinnum == TC_METALSONIC)
dest_colormap[159] = 0;
return;
} }
else if (color == SKINCOLOR_NONE) else if (color == SKINCOLOR_NONE)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment