mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
492: Don't interrupt existing polyobj fader unless EFFECT5
This commit is contained in:
parent
d8b57f32e7
commit
ae5b02bccd
1 changed files with 10 additions and 1 deletions
11
src/p_spec.c
11
src/p_spec.c
|
|
@ -1276,7 +1276,7 @@ static boolean PolyFade(line_t *line)
|
||||||
|
|
||||||
if (!(po = Polyobj_GetForNum(polyObjNum)))
|
if (!(po = Polyobj_GetForNum(polyObjNum)))
|
||||||
{
|
{
|
||||||
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: bad polyobj %d\n", polyObjNum);
|
CONS_Debug(DBG_POLYOBJ, "PolyFade: bad polyobj %d\n", polyObjNum);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1284,6 +1284,15 @@ static boolean PolyFade(line_t *line)
|
||||||
if (po->isBad)
|
if (po->isBad)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
// Prevent continuous execs from interfering on an existing fade
|
||||||
|
if (!(line->flags & ML_EFFECT5)
|
||||||
|
&& po->thinker
|
||||||
|
&& po->thinker->function.acp1 == (actionf_p1)T_PolyObjFade)
|
||||||
|
{
|
||||||
|
CONS_Debug(DBG_POLYOBJ, "Line type 492 Executor: Fade PolyObject thinker already exists\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
pfd.polyObjNum = polyObjNum;
|
pfd.polyObjNum = polyObjNum;
|
||||||
|
|
||||||
// if DONTPEGBOTTOM, specify raw translucency value in Front X Offset
|
// if DONTPEGBOTTOM, specify raw translucency value in Front X Offset
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue