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

Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef

Browse source
This commit is contained in:
mazmazz 2018-09-12 09:11:35 -04:00
commit ee51f586c2
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_setup.c
View file

@ -1459,9 +1459,6 @@ static void P_LoadRawSideDefs2(void *data)
sd->sector = sec = &sectors[sector_num]; sd->sector = sec = &sectors[sector_num];
} }
// refined to allow colormaps to work as wall textures if invalid as colormaps
// but valid as textures.
sd->sector = sec = &sectors[SHORT(msd->sector)]; sd->sector = sec = &sectors[SHORT(msd->sector)];
// Colormaps! // Colormaps!

2
src/r_data.c
View file

@ -1905,8 +1905,6 @@ 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)
{ {
extracolormap_t *exc;
// 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!