zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: DPSprite::GetRenderStyle returned the wrong alpha value.

Browse source
This commit is contained in:
Christoph Oelckers 2017-05-03 10:26:25 +02:00
parent 00dab8677a
commit f9445e96f5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_pspr.cpp
View file

@ -322,7 +322,6 @@ std::pair<FRenderStyle, float> DPSprite::GetRenderStyle(FRenderStyle ownerstyle,
mystyle.CheckFuzz(); mystyle.CheckFuzz();
if (Flags & PSPF_RENDERSTYLE) if (Flags & PSPF_RENDERSTYLE)
{ {
ownerstyle.CheckFuzz();
if (Flags & PSPF_FORCESTYLE) if (Flags & PSPF_FORCESTYLE)
{ {
returnstyle = mystyle; returnstyle = mystyle;
@ -372,6 +371,10 @@ std::pair<FRenderStyle, float> DPSprite::GetRenderStyle(FRenderStyle ownerstyle,
returnalpha = owneralpha * alpha; returnalpha = owneralpha * alpha;
} }
} }
else
{
returnalpha = owneralpha;
}
// Should normal renderstyle come out on top at the end and we desire alpha, // Should normal renderstyle come out on top at the end and we desire alpha,
// switch it to translucent. Normal never applies any sort of alpha. // switch it to translucent. Normal never applies any sort of alpha.
@ -381,7 +384,7 @@ std::pair<FRenderStyle, float> DPSprite::GetRenderStyle(FRenderStyle ownerstyle,
returnalpha = owneralpha * alpha; returnalpha = owneralpha * alpha;
} }
return{ returnstyle, clamp<float>(float(alpha), 0.f, 1.f) }; return{ returnstyle, clamp<float>(float(returnalpha), 0.f, 1.f) };
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------