AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 21:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Minor fixes to CMetroidAreaCollider and CHudThreatInterface

Browse Source
This commit is contained in:
Phillip Stephens
2018-05-24 18:23:27 -07:00
parent 3ceaa82035
commit 48f41b6c73
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/GuiSys/CHudThreatInterface.cpp
View File

@@ -231,7 +231,7 @@ void CHudThreatInterface::Update(float dt)
color.a = x48_warningLerpAlpha * xc_damagePulse;
x68_textpane_threatwarning->SetColor(color);
}
if (x68_textpane_threatwarning->GetGeometryColor().a)
if (x68_textpane_threatwarning->GetGeometryColor().a > 0.f)
x68_textpane_threatwarning->SetIsVisible(true);
else
x68_textpane_threatwarning->SetIsVisible(false);
@@ -240,7 +240,7 @@ void CHudThreatInterface::Update(float dt)
if (x4c_threatStatus == EThreatStatus::Damage)
x50_warningColorLerp = std::min(x50_warningColorLerp + 2.f * dt, 1.f);
else
x50_warningColorLerp = std::min(x50_warningColorLerp - 2.f * dt, 1.f);
x50_warningColorLerp = std::max(0.f, x50_warningColorLerp - 2.f * dt);
}
std::pair<zeus::CVector3f, zeus::CVector3f> CHudThreatInterface::CombatThreatBarCoordFunc(float t)