lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change Lavender, Azure, Blue

Browse source
This commit is contained in:
Sryder13 2015-08-21 18:34:21 +01:00
parent 079f02ca69
commit d0d19e684c
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/r_draw.c
View file

@ -324,6 +324,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
case SKINCOLOR_WHITE: case SKINCOLOR_WHITE:
case SKINCOLOR_BLACK: case SKINCOLOR_BLACK:
case SKINCOLOR_PINK: case SKINCOLOR_PINK:
case SKINCOLOR_LAVENDER:
case SKINCOLOR_ZIM: case SKINCOLOR_ZIM:
// 8 color ramp // 8 color ramp
for (i = 0; i < SKIN_RAMP_LENGTH; i++) for (i = 0; i < SKIN_RAMP_LENGTH; i++)
@ -360,8 +361,6 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
{ {
if (8*i/16 <= 1) if (8*i/16 <= 1)
dest_colormap[starttranscolor + i] = (UINT8)(0x80 + 8*i/16); // Lightest dest_colormap[starttranscolor + i] = (UINT8)(0x80 + 8*i/16); // Lightest
else if (8*i/16 == 7)
dest_colormap[starttranscolor + i] = 0x7B; // Darkest
else else
dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 2); // main dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH) - 2); // main
} }
@ -371,7 +370,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
for (i = 0; i < SKIN_RAMP_LENGTH; i++) for (i = 0; i < SKIN_RAMP_LENGTH; i++)
{ {
if (i == 14) if (i == 14)
dest_colormap[starttranscolor + i] = 0x9F; dest_colormap[starttranscolor + i] = 0xED;
else if (i == 15) else if (i == 15)
dest_colormap[starttranscolor + i] = 0x1F; dest_colormap[starttranscolor + i] = 0x1F;
else else
@ -426,17 +425,6 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
} }
break; break;
case SKINCOLOR_LAVENDER:
// 10 colors
for (i = 0; i < SKIN_RAMP_LENGTH; i++)
{
if (10*i/16 <= 1)
dest_colormap[starttranscolor + i] = (UINT8)(0xEC + 10*i/16); // Lightest
else
dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // main
}
break;
case SKINCOLOR_PURPLE: case SKINCOLOR_PURPLE:
// 10 colors // 10 colors
for (i = 0; i < SKIN_RAMP_LENGTH; i++) for (i = 0; i < SKIN_RAMP_LENGTH; i++)