AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CSamusDoll: Eliminate variable shadowing in Draw()

This commit is contained in:
Lioncash 2020-02-24 01:50:44 -05:00
parent 9042dddc8c
commit 7e2ef9c8ea
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Runtime/MP1/CSamusDoll.cpp
View File

@ -548,23 +548,23 @@ void CSamusDoll::Draw(const CStateManager& mgr, float alpha) {
if (x270_24_hasSpiderBall) { if (x270_24_hasSpiderBall) {
CGraphics::SetModelMatrix(x10_ballXf); CGraphics::SetModelMatrix(x10_ballXf);
CModelFlags flags = {}; CModelFlags spiderBallGlassFlags = {};
flags.x1_matSetIdx = x1e4_glassMatIdx; spiderBallGlassFlags.x1_matSetIdx = x1e4_glassMatIdx;
x1d4_spiderBallGlass->GetInstance().ActivateLights(x23c_lights); x1d4_spiderBallGlass->GetInstance().ActivateLights(x23c_lights);
flags.m_extendedShader = EExtendedShader::SolidColorBackfaceCullLEqualAlphaOnly; spiderBallGlassFlags.m_extendedShader = EExtendedShader::SolidColorBackfaceCullLEqualAlphaOnly;
flags.x4_color = zeus::skWhite; spiderBallGlassFlags.x4_color = zeus::skWhite;
x1d4_spiderBallGlass->Draw(flags); x1d4_spiderBallGlass->Draw(spiderBallGlassFlags);
flags.m_extendedShader = EExtendedShader::ForcedAlpha; spiderBallGlassFlags.m_extendedShader = EExtendedShader::ForcedAlpha;
flags.x4_color = zeus::skWhite; spiderBallGlassFlags.x4_color = zeus::skWhite;
flags.x4_color.a() = alpha; spiderBallGlassFlags.x4_color.a() = alpha;
x1d4_spiderBallGlass->Draw(flags); x1d4_spiderBallGlass->Draw(spiderBallGlassFlags);
flags.m_extendedShader = EExtendedShader::ForcedAdditive; spiderBallGlassFlags.m_extendedShader = EExtendedShader::ForcedAdditive;
flags.x4_color = zeus::skWhite; spiderBallGlassFlags.x4_color = zeus::skWhite;
flags.x4_color.a() = x6c_ballPulseFactor * alpha * itemPulse; spiderBallGlassFlags.x4_color.a() = x6c_ballPulseFactor * alpha * itemPulse;
x1d4_spiderBallGlass->Draw(flags); x1d4_spiderBallGlass->Draw(spiderBallGlassFlags);
} }
} }