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

447: AddColormap no longer returns chained colormap, so chain it ourselves

Browse source
This commit is contained in:
mazmazz 2018-09-12 07:31:10 -04:00
parent 867bde3789
commit 9a388af8ec
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/p_spec.c
View file

@ -3258,7 +3258,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
for (secnum = -1; (secnum = P_FindSectorFromLineTag(line, secnum)) >= 0 ;) for (secnum = -1; (secnum = P_FindSectorFromLineTag(line, secnum)) >= 0 ;)
{ {
if (line->flags & ML_EFFECT3) // relative calc if (line->flags & ML_EFFECT3) // relative calc
sectors[secnum].extra_colormap = R_AddColormaps( {
extracolormap_t *exc = R_AddColormaps(
sectors[secnum].extra_colormap, line->frontsector->extra_colormap, sectors[secnum].extra_colormap, line->frontsector->extra_colormap,
line->flags & ML_EFFECT1, // subtract R line->flags & ML_EFFECT1, // subtract R
line->flags & ML_NOCLIMB, // subtract G line->flags & ML_NOCLIMB, // subtract G
@ -3274,7 +3275,17 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
line->flags & ML_DONTPEGBOTTOM, line->flags & ML_DONTPEGBOTTOM,
(line->flags & ML_DONTPEGBOTTOM) ? (sides[line->sidenum[0]].textureoffset >> FRACBITS) : 0, (line->flags & ML_DONTPEGBOTTOM) ? (sides[line->sidenum[0]].textureoffset >> FRACBITS) : 0,
(line->flags & ML_DONTPEGBOTTOM) ? (sides[line->sidenum[0]].rowoffset >> FRACBITS) : 0, (line->flags & ML_DONTPEGBOTTOM) ? (sides[line->sidenum[0]].rowoffset >> FRACBITS) : 0,
true); false);
if (!(sectors[secnum].extra_colormap = R_GetColormapFromList(exc)))
{
exc->colormap = R_CreateLightTable(exc);
R_AddColormapToList(exc);
sectors[secnum].extra_colormap = exc;
}
else
Z_Free(exc);
}
else else
sectors[secnum].extra_colormap = line->frontsector->extra_colormap; sectors[secnum].extra_colormap = line->frontsector->extra_colormap;
} }