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

Merge pull request #275 from lioncash/const-over 

CPlayerState: Rename HealthInfo() to GetHealthInfo()
This commit is contained in:
Phillip Stephens 2020-03-24 17:45:59 -07:00 committed by GitHub
parent 01a0c68db9 ef93a601eb
commit e8f0d29a3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/CPlayerState.cpp
View File

@ -182,7 +182,7 @@ u32 CPlayerState::CalculateItemCollectionRate() const {
return total + GetItemCapacity(EItemType::Wavebuster);
}
CHealthInfo& CPlayerState::HealthInfo() { return xc_health; }
CHealthInfo& CPlayerState::GetHealthInfo() { return xc_health; }
const CHealthInfo& CPlayerState::GetHealthInfo() const { return xc_health; }

2
Runtime/CPlayerState.hpp
View File

@ -123,7 +123,7 @@ public:
static constexpr float GetMissileComboChargeFactor() { return 1.8f; }
u32 CalculateItemCollectionRate() const;
CHealthInfo& HealthInfo();
CHealthInfo& GetHealthInfo();
const CHealthInfo& GetHealthInfo() const;
u32 GetPickupTotal() { return 99; }
void SetIsFusionEnabled(bool val) { x0_26_fusion = val; }

2
Runtime/World/CPlayer.cpp
View File

@ -1049,7 +1049,7 @@ void CPlayer::TakeDamage(bool significant, const zeus::CVector3f& location, floa
void CPlayer::Accept(IVisitor& visitor) { visitor.Visit(this); }
CHealthInfo* CPlayer::HealthInfo(CStateManager& mgr) { return &mgr.GetPlayerState()->HealthInfo(); }
CHealthInfo* CPlayer::HealthInfo(CStateManager& mgr) { return &mgr.GetPlayerState()->GetHealthInfo(); }
bool CPlayer::IsUnderBetaMetroidAttack(const CStateManager& mgr) const {
if (x274_energyDrain.GetEnergyDrainIntensity() > 0.f) {