stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-07 00:41:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Colormap overhaul r_data: Mixed D+C fix

Browse source
This commit is contained in:
mazmazz 2018-09-15 00:48:34 -04:00
parent 2f995f4cbe
commit 57959522e2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/r_data.c
View file

@ -1905,6 +1905,8 @@ extracolormap_t *R_AddColormaps(extracolormap_t *exc_augend, extracolormap_t *ex
boolean useAltAlpha, INT16 altAlpha, INT16 altFadeAlpha, boolean useAltAlpha, INT16 altAlpha, INT16 altFadeAlpha,
boolean lighttable) boolean lighttable)
{ {
INT16 red, green, blue, alpha;
// exc_augend is added (or subtracted) onto by exc_addend // exc_augend is added (or subtracted) onto by exc_addend
// In Rennaisance times, the first number was considered the augend, the second number the addend // In Rennaisance times, the first number was considered the augend, the second number the addend
// But since the commutative property was discovered, today they're both called addends! // But since the commutative property was discovered, today they're both called addends!
@ -1914,8 +1916,6 @@ extracolormap_t *R_AddColormaps(extracolormap_t *exc_augend, extracolormap_t *ex
if(!exc_addend) if(!exc_addend)
exc_addend = R_GetDefaultColormap(); exc_addend = R_GetDefaultColormap();
INT16 red, green, blue, alpha;
/////////////////// ///////////////////
// base rgba // base rgba
/////////////////// ///////////////////