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

CAutoMapper: Eliminate cases of variable shadowing 

Silences two variable shadowing warnings.
This commit is contained in:
Lioncash 2019-10-01 22:43:20 -04:00
parent 3383e65761
commit 44306ab528
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Runtime/AutoMapper/CAutoMapper.cpp
View File

@ -1434,14 +1434,15 @@ void CAutoMapper::Draw(const CStateManager& mgr, const zeus::CTransform& xf, flo
CMapArea::GetAreaPostTranslate(*x24_world, mgr.GetNextAreaId()) + CMapArea::GetAreaPostTranslate(*x24_world, mgr.GetNextAreaId()) +
mgr.GetPlayer().GetTranslation()); mgr.GetPlayer().GetTranslation());
CGraphics::SetModelMatrix(mapXf * playerXf * zeus::CTransform::Scale(scale * (0.25f * func + 0.75f))); CGraphics::SetModelMatrix(mapXf * playerXf * zeus::CTransform::Scale(scale * (0.25f * func + 0.75f)));
float alpha; float colorAlpha;
if (x1bc_state != EAutoMapperState::MiniMap && x1c0_nextState != EAutoMapperState::MiniMap) if (x1bc_state != EAutoMapperState::MiniMap && x1c0_nextState != EAutoMapperState::MiniMap) {
alpha = 1.f; colorAlpha = 1.f;
else } else {
alpha = xa8_renderStates[0].x34_alphaSurfaceVisited; colorAlpha = xa8_renderStates[0].x34_alphaSurfaceVisited;
alpha *= mapAlpha; }
colorAlpha *= mapAlpha;
zeus::CColor modColor = g_tweakAutoMapper->GetMiniMapSamusModColor(); zeus::CColor modColor = g_tweakAutoMapper->GetMiniMapSamusModColor();
modColor.a() *= alpha; modColor.a() *= colorAlpha;
CModelFlags flags(5, 0, 8 | 1, modColor); /* Depth GEqual */ CModelFlags flags(5, 0, 8 | 1, modColor); /* Depth GEqual */
flags.m_extendedShader = EExtendedShader::DepthGEqualNoZWrite; flags.m_extendedShader = EExtendedShader::DepthGEqualNoZWrite;
x30_miniMapSamus->Draw(flags); x30_miniMapSamus->Draw(flags);
@ -1480,14 +1481,14 @@ void CAutoMapper::Draw(const CStateManager& mgr, const zeus::CTransform& xf, flo
{{4.f, -8.f, 8.f}, {1.f, 1.f}}, {{4.f, -8.f, 8.f}, {1.f, 1.f}},
{{4.f, -8.f, 0.f}, {1.f, 0.f}}, {{4.f, -8.f, 0.f}, {1.f, 0.f}},
}}; }};
float alpha = beaconAlpha; float colorAlpha = beaconAlpha;
if (x1bc_state != EAutoMapperState::MiniMap && x1c0_nextState != EAutoMapperState::MiniMap) { if (x1bc_state != EAutoMapperState::MiniMap && x1c0_nextState != EAutoMapperState::MiniMap) {
} else { } else {
alpha *= xa8_renderStates[0].x34_alphaSurfaceVisited; colorAlpha *= xa8_renderStates[0].x34_alphaSurfaceVisited;
} }
alpha *= mapAlpha; colorAlpha *= mapAlpha;
zeus::CColor color = zeus::skWhite; zeus::CColor color = zeus::skWhite;
color.a() = alpha; color.a() = colorAlpha;
filter.drawVerts(color, verts.data()); filter.drawVerts(color, verts.data());
} }
} }