mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-31 05:30:48 +00:00
Enable FF_CUTSOLIDS handling and updating by sector->moved
This commit is contained in:
parent
47c9bf2ebc
commit
fcc7180d5c
1 changed files with 18 additions and 3 deletions
21
src/p_spec.c
21
src/p_spec.c
|
@ -7541,13 +7541,23 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
|
||||||
{
|
{
|
||||||
if (alpha >= 256)
|
if (alpha >= 256)
|
||||||
{
|
{
|
||||||
//rover->flags |= (FF_CUTLEVEL | FF_CUTEXTRA);
|
if (!(rover->flags & FF_CUTSOLIDS) &&
|
||||||
|
(rover->spawnflags & FF_CUTSOLIDS))
|
||||||
|
{
|
||||||
|
rover->flags |= FF_CUTSOLIDS;
|
||||||
|
rover->target->moved = true;
|
||||||
|
}
|
||||||
rover->flags &= ~FF_TRANSLUCENT;
|
rover->flags &= ~FF_TRANSLUCENT;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
rover->flags |= FF_TRANSLUCENT;
|
rover->flags |= FF_TRANSLUCENT;
|
||||||
//rover->flags &= ~(FF_CUTLEVEL | FF_CUTEXTRA);
|
if ((rover->flags & FF_CUTSOLIDS) &&
|
||||||
|
(rover->spawnflags & FF_CUTSOLIDS))
|
||||||
|
{
|
||||||
|
rover->flags &= ~FF_CUTSOLIDS;
|
||||||
|
rover->target->moved = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7559,7 +7569,12 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
|
||||||
if (dotranslucent)
|
if (dotranslucent)
|
||||||
{
|
{
|
||||||
rover->flags |= FF_TRANSLUCENT;
|
rover->flags |= FF_TRANSLUCENT;
|
||||||
//rover->flags &= ~(FF_CUTLEVEL | FF_CUTEXTRA);
|
if ((rover->flags & FF_CUTSOLIDS) &&
|
||||||
|
(rover->spawnflags & FF_CUTSOLIDS))
|
||||||
|
{
|
||||||
|
rover->flags &= ~FF_CUTSOLIDS;
|
||||||
|
rover->target->moved = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (docollision)
|
if (docollision)
|
||||||
|
|
Loading…
Reference in a new issue