From 7e2ef9c8ea06cf29d3c89a87cf5b68a0c907cb5b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 24 Feb 2020 01:50:44 -0500 Subject: [PATCH] CSamusDoll: Eliminate variable shadowing in Draw() --- Runtime/MP1/CSamusDoll.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Runtime/MP1/CSamusDoll.cpp b/Runtime/MP1/CSamusDoll.cpp index 3c3c38ea4..a4ca9f2cb 100644 --- a/Runtime/MP1/CSamusDoll.cpp +++ b/Runtime/MP1/CSamusDoll.cpp @@ -548,23 +548,23 @@ void CSamusDoll::Draw(const CStateManager& mgr, float alpha) { if (x270_24_hasSpiderBall) { CGraphics::SetModelMatrix(x10_ballXf); - CModelFlags flags = {}; - flags.x1_matSetIdx = x1e4_glassMatIdx; + CModelFlags spiderBallGlassFlags = {}; + spiderBallGlassFlags.x1_matSetIdx = x1e4_glassMatIdx; x1d4_spiderBallGlass->GetInstance().ActivateLights(x23c_lights); - flags.m_extendedShader = EExtendedShader::SolidColorBackfaceCullLEqualAlphaOnly; - flags.x4_color = zeus::skWhite; - x1d4_spiderBallGlass->Draw(flags); + spiderBallGlassFlags.m_extendedShader = EExtendedShader::SolidColorBackfaceCullLEqualAlphaOnly; + spiderBallGlassFlags.x4_color = zeus::skWhite; + x1d4_spiderBallGlass->Draw(spiderBallGlassFlags); - flags.m_extendedShader = EExtendedShader::ForcedAlpha; - flags.x4_color = zeus::skWhite; - flags.x4_color.a() = alpha; - x1d4_spiderBallGlass->Draw(flags); + spiderBallGlassFlags.m_extendedShader = EExtendedShader::ForcedAlpha; + spiderBallGlassFlags.x4_color = zeus::skWhite; + spiderBallGlassFlags.x4_color.a() = alpha; + x1d4_spiderBallGlass->Draw(spiderBallGlassFlags); - flags.m_extendedShader = EExtendedShader::ForcedAdditive; - flags.x4_color = zeus::skWhite; - flags.x4_color.a() = x6c_ballPulseFactor * alpha * itemPulse; - x1d4_spiderBallGlass->Draw(flags); + spiderBallGlassFlags.m_extendedShader = EExtendedShader::ForcedAdditive; + spiderBallGlassFlags.x4_color = zeus::skWhite; + spiderBallGlassFlags.x4_color.a() = x6c_ballPulseFactor * alpha * itemPulse; + x1d4_spiderBallGlass->Draw(spiderBallGlassFlags); } }