455: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
This commit is contained in:
parent
64b96c7192
commit
56ee711f33
11
src/p_spec.c
11
src/p_spec.c
|
@ -3377,11 +3377,18 @@ 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 ;)
|
||||||
{
|
{
|
||||||
extracolormap_t *source_exc, *dest_exc, *exc;
|
extracolormap_t *source_exc, *dest_exc, *exc;
|
||||||
|
INT32 speed = (INT32)((line->flags & ML_DONTPEGBOTTOM) || !sides[line->sidenum[0]].rowoffset) && line->sidenum[1] != 0xFFFF ?
|
||||||
|
abs(sides[line->sidenum[1]].rowoffset >> FRACBITS)
|
||||||
|
: abs(sides[line->sidenum[0]].rowoffset >> FRACBITS);
|
||||||
|
|
||||||
// Prevent continuous execs from interfering on an existing fade
|
// Prevent continuous execs from interfering on an existing fade
|
||||||
if (!(line->flags & ML_EFFECT5)
|
if (!(line->flags & ML_EFFECT5)
|
||||||
&& sectors[secnum].fadecolormapdata)
|
&& sectors[secnum].fadecolormapdata)
|
||||||
|
//&& ((fadecolormap_t*)sectors[secnum].fadecolormapdata)->timer > (ticbased ? 2 : speed*2))
|
||||||
|
{
|
||||||
|
CONS_Debug(DBG_GAMELOGIC, "Line type 455 Executor: Fade color thinker already exists, timer: %d", ((fadecolormap_t*)sectors[secnum].fadecolormapdata)->timer);
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (line->flags & ML_TFERLINE) // use back colormap instead of target sector
|
if (line->flags & ML_TFERLINE) // use back colormap instead of target sector
|
||||||
sectors[secnum].extra_colormap = (line->sidenum[1] != 0xFFFF) ?
|
sectors[secnum].extra_colormap = (line->sidenum[1] != 0xFFFF) ?
|
||||||
|
@ -3451,9 +3458,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
||||||
Z_Free(exc);
|
Z_Free(exc);
|
||||||
|
|
||||||
Add_ColormapFader(§ors[secnum], source_exc, dest_exc, (line->flags & ML_EFFECT4), // tic-based timing
|
Add_ColormapFader(§ors[secnum], source_exc, dest_exc, (line->flags & ML_EFFECT4), // tic-based timing
|
||||||
((line->flags & ML_DONTPEGBOTTOM) || !sides[line->sidenum[0]].rowoffset) && line->sidenum[1] != 0xFFFF ?
|
speed);
|
||||||
abs(sides[line->sidenum[1]].rowoffset >> FRACBITS)
|
|
||||||
: abs(sides[line->sidenum[0]].rowoffset >> FRACBITS));
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue