lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
mazmazz 2018-09-12 08:03:45 -04:00
parent 4d26cf6330 55c43a2161
commit 7767adbf32
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
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,
@ -1998,17 +1998,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!