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

Cleanup fade fake floor code

This commit is contained in:
mazmazz 2018-08-17 15:59:34 -04:00
parent 45ae6efbad
commit bf5efe6457
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/p_spec.c
View File

@ -7282,19 +7282,14 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
{
if (rover->alpha >= 256)
{
//rover->flags |= FF_CUTLEVEL;
//rover->flags |= (FF_CUTLEVEL | FF_CUTEXTRA);
rover->flags &= ~FF_TRANSLUCENT;
}
else
{
rover->flags |= FF_TRANSLUCENT;
//rover->flags &= ~FF_CUTLEVEL;
//rover->flags &= ~(FF_CUTLEVEL | FF_CUTEXTRA);
}
// if (rover->flags & FF_SOLID)
// rover->flags &= ~FF_CUTSPRITES;
// else
// rover->flags |= FF_CUTSPRITES;
}
}
else
@ -7305,17 +7300,12 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
if (dotranslucent)
{
rover->flags |= FF_TRANSLUCENT;
//rover->flags &= ~FF_CUTLEVEL;
// if (rover->flags & FF_SOLID)
// rover->flags &= ~FF_CUTSPRITES;
// else
// rover->flags |= FF_CUTSPRITES;
//rover->flags &= ~(FF_CUTLEVEL | FF_CUTEXTRA);
}
if (docollision)
{
if (doghostfade) // remove interaction flags during fade
if (doghostfade) // remove collision flags during fade
{
if (rover->spawnflags & FF_SOLID)
rover->flags &= ~FF_SOLID;
@ -7326,7 +7316,7 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed,
if (rover->spawnflags & FF_BUSTUP)
rover->flags &= ~FF_BUSTUP;
}
else // keep interaction during fade
else // keep collision during fade
{
if (rover->spawnflags & FF_SOLID)
rover->flags |= FF_SOLID;