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

Merge branch 'colormap-overhaul' into colormap-overhaul-fade

Browse source
This commit is contained in:
mazmazz 2018-09-12 08:08:02 -04:00
commit 5e08f79035
2 changed files with 4 additions and 17 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!

18
src/r_data.c
View file

@ -1896,7 +1896,7 @@ extracolormap_t *R_CreateColormap(char *p1, char *p2, char *p3)
// //
// R_AddColormaps() // R_AddColormaps()
// NOTE: The result colormap DOES get added to the extra_colormaps chain! // NOTE: The result colormap is not added to the extra_colormaps chain. You must do that yourself!
// //
extracolormap_t *R_AddColormaps(extracolormap_t *exc_augend, extracolormap_t *exc_addend, extracolormap_t *R_AddColormaps(extracolormap_t *exc_augend, extracolormap_t *exc_addend,
boolean subR, boolean subG, boolean subB, boolean subA, boolean subR, boolean subG, boolean subB, boolean subA,
@ -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!
@ -1998,17 +1996,9 @@ extracolormap_t *R_AddColormaps(extracolormap_t *exc_augend, extracolormap_t *ex
// put it together // put it together
/////////////////// ///////////////////
if (!(exc = R_GetColormapFromList(exc_augend))) exc_augend->colormap = lighttable ? R_CreateLightTable(exc_augend) : NULL;
{ exc_augend->next = exc_augend->prev = NULL;
exc_augend->colormap = lighttable ? R_CreateLightTable(exc_augend) : NULL; return exc_augend;
R_AddColormapToList(exc_augend);
return exc_augend;
}
else
{
Z_Free(exc_augend);
return exc;
}
} }
// Thanks to quake2 source! // Thanks to quake2 source!