Simplify R_DoPlayerFade crash fix a bit and rename playerdist to otherplayerdist
This commit is contained in:
1 parent
404d88a536
commit
ce3d17de68
1 file changed
+9
-12
+9
-12
@@ -2963,24 +2963,21 @@ fixed_t R_DoPlayerFade(mobj_t *thing)
|
||||
if (thing->player == viewplayer || viewplayer->exiting || viewplayer->spectator || camera[R_GetViewNumber()].freecam || leveltime < countdownstarttime)
|
||||
return fadealpha;
|
||||
|
||||
const INT32 playerdist = (FixedMul((thing->x - viewx), viewcos) + FixedMul((thing->y - viewy), viewsin)) >> FRACBITS;
|
||||
const INT32 viewplayerdist = (FixedMul((viewplayer->mo->x - viewx), viewcos) + FixedMul((viewplayer->mo->y - viewy), viewsin)) >> FRACBITS;
|
||||
const INT32 otherplayerdist = (FixedMul((thing->x - viewx), viewcos) + FixedMul((thing->y - viewy), viewsin)) >> FRACBITS;
|
||||
const INT32 viewplayerdist = (FixedMul((viewplayer->mo->x - viewx), viewcos) + FixedMul((viewplayer->mo->y - viewy), viewsin)) >> FRACBITS;
|
||||
|
||||
if (playerdist < viewplayerdist)
|
||||
if (viewplayerdist < 2)
|
||||
return fadealpha; // avoid zero division
|
||||
|
||||
if (otherplayerdist < viewplayerdist)
|
||||
{
|
||||
if (playerdist < viewplayerdist / 2) // stronger fade when very close
|
||||
if (otherplayerdist < viewplayerdist / 2) // stronger fade when very close
|
||||
{
|
||||
if (viewplayerdist < 2)
|
||||
return fadealpha; // avoid zero division
|
||||
|
||||
fadealpha = (playerdist * FRACUNIT) / (viewplayerdist / 2) / 3;
|
||||
fadealpha = (otherplayerdist * FRACUNIT) / (viewplayerdist / 2) / 3;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (viewplayerdist == 0)
|
||||
return fadealpha; // avoid zero division
|
||||
|
||||
fadealpha = (playerdist * FRACUNIT) / viewplayerdist;
|
||||
fadealpha = (otherplayerdist * FRACUNIT) / viewplayerdist;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user