stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 18:41:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into directionchar

Browse source
This commit is contained in:
toasterbabe 2017-04-07 12:48:48 +01:00
commit 25754ad708
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/r_draw.c
View file

@ -420,11 +420,11 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
if (i <= 11) if (i <= 11)
dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1)); dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
else if (i == 12) else if (i == 12)
dest_colormap[starttranscolor + i] = 0x2c; // Darkest 4 dest_colormap[starttranscolor + i] = 0x2c;
else if (i == 13) else if (i <= 14)
dest_colormap[starttranscolor + i] = 0xfe; // Darkest 3 dest_colormap[starttranscolor + i] = 0x2d;
else else
dest_colormap[starttranscolor + i] = 0x2d + i - 14; // Darkest 2 and 1 dest_colormap[starttranscolor + i] = 0x48;
} }
break; break;
@ -530,7 +530,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 == 15) if (i == 15)
dest_colormap[starttranscolor + i] = 0x1F; //Darkest 1 dest_colormap[starttranscolor + i] = 0xfe; //Darkest 1
else if (i == 14) else if (i == 14)
dest_colormap[starttranscolor + i] = 0xfd; //Darkest 2 dest_colormap[starttranscolor + i] = 0xfd; //Darkest 2
else else