Fix fog visual glitch with fading
This commit is contained in:
parent
0202bbcfd3
commit
9cc186441b
|
@ -7481,6 +7481,7 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, bo
|
|||
// initialize its alpha to 1
|
||||
if (dotranslucent &&
|
||||
(rover->spawnflags & FF_NOSHADE) && // do not include light blocks, which don't set FF_NOSHADE
|
||||
!(rover->flags & FF_FOG) && // do not include fog
|
||||
!(rover->spawnflags & FF_RENDERSIDES) &&
|
||||
!(rover->spawnflags & FF_RENDERPLANES) &&
|
||||
!(rover->flags & FF_RENDERALL))
|
||||
|
@ -7572,7 +7573,7 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, bo
|
|||
rover->target->moved = true;
|
||||
}
|
||||
|
||||
if (dotranslucent)
|
||||
if (dotranslucent && !(rover->flags & FF_FOG))
|
||||
{
|
||||
if (alpha >= 256)
|
||||
{
|
||||
|
@ -7619,7 +7620,7 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, bo
|
|||
rover->flags |= FF_EXISTS;
|
||||
}
|
||||
|
||||
if (dotranslucent)
|
||||
if (dotranslucent && !(rover->flags & FF_FOG))
|
||||
{
|
||||
rover->flags |= FF_TRANSLUCENT;
|
||||
|
||||
|
@ -7667,6 +7668,8 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, bo
|
|||
}
|
||||
}
|
||||
|
||||
if (!(rover->flags & FF_FOG)) // don't set FOG alpha
|
||||
{
|
||||
if (!stillfading || exactalpha)
|
||||
rover->alpha = alpha;
|
||||
else // clamp fadingdata->alpha to software's alpha levels
|
||||
|
@ -7694,6 +7697,7 @@ static boolean P_FadeFakeFloor(ffloor_t *rover, INT16 destvalue, INT16 speed, bo
|
|||
else // Opaque
|
||||
rover->alpha = destvalue >= 243 ? destvalue : 256;
|
||||
}
|
||||
}
|
||||
|
||||
if (fadingdata)
|
||||
fadingdata->alpha = alpha;
|
||||
|
|
Loading…
Reference in New Issue