stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-29 20:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fixedpal' into 'master'

Browse source 
Fixing the reduced palette

Index number 254 remapped from a dark browny-orange to a dark blue. Otherwise unchanged; most of the assets we have currently created do not use the index for its previous purpose. It would be nice to get this merged quickly so that there is certainty about what we use going forward.

http://i.imgur.com/9xuQApq.png

root/toaster/fixedpal contains every necessary asset file, including the SLADE translation lump.

See merge request !77
This commit is contained in:
Rob 2017-04-06 21:26:08 -04:00
commit f2923284d8
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)
dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
else if (i == 12)
dest_colormap[starttranscolor + i] = 0x2c; // Darkest 4
else if (i == 13)
dest_colormap[starttranscolor + i] = 0xfe; // Darkest 3
dest_colormap[starttranscolor + i] = 0x2c;
else if (i <= 14)
dest_colormap[starttranscolor + i] = 0x2d;
else
dest_colormap[starttranscolor + i] = 0x2d + i - 14; // Darkest 2 and 1
dest_colormap[starttranscolor + i] = 0x48;
}
break;
@ -530,7 +530,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
for (i = 0; i < SKIN_RAMP_LENGTH; i++)
{
if (i == 15)
dest_colormap[starttranscolor + i] = 0x1F; //Darkest 1
dest_colormap[starttranscolor + i] = 0xfe; //Darkest 1
else if (i == 14)
dest_colormap[starttranscolor + i] = 0xfd; //Darkest 2
else