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

Update kaubfuda

Browse Source
This commit is contained in:
Phillip Stephens
2016-06-30 12:33:38 -07:00
parent 9a1e4dc161
commit 8c2d5eb3a3
8 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Runtime/CPlayerState.cpp
View File

@@ -59,7 +59,7 @@ CPlayerState::CPlayerState(CBitStreamReader& stream)
{
x4_ = stream.ReadEncoded(0x20);
u32 tmp = stream.ReadEncoded(0x20);
xc_currentHealth = *reinterpret_cast<float*>(&tmp);
xc_health.SetHP(*reinterpret_cast<float*>(&tmp));
x8_currentBeam = EBeamId(stream.ReadEncoded(CBitStreamReader::GetBitCount(5)));
x20_currentSuit = EPlayerSuit(stream.ReadEncoded(CBitStreamReader::GetBitCount(4)));
x24_powerups.resize(41);
@@ -90,8 +90,8 @@ CPlayerState::CPlayerState(CBitStreamReader& stream)
void CPlayerState::PutTo(CBitStreamWriter &stream)
{
stream.WriteEncoded(x4_, 32);
u32 tmp = *reinterpret_cast<int*>(&xc_currentHealth);
stream.WriteEncoded(tmp, 32);
float hp = xc_health.GetHP();
stream.WriteEncoded(*reinterpret_cast<int*>(&hp), 32);
stream.WriteEncoded((u32)x8_currentBeam, CBitStreamWriter::GetBitCount(5));
stream.WriteEncoded((u32)x20_currentSuit, CBitStreamWriter::GetBitCount(4));
for (u32 i = 0; i < x24_powerups.size(); ++i)
@@ -175,6 +175,16 @@ u32 CPlayerState::CalculateItemCollectionRate() const
return total + GetItemCapacity(EItemType::Wavebuster);
}
CHealthInfo& CPlayerState::HealthInfo()
{
return xc_health;
}
CHealthInfo CPlayerState::GetHealthInfo() const
{
return xc_health;
}
CPlayerState::EPlayerSuit CPlayerState::GetCurrentSuit() const
{
if (GetFusion())
@@ -335,7 +345,7 @@ void CPlayerState::IncrPickup(EItemType type, s32 amount)
case EItemType::HealthRefill:
{
float health = CalculateHealth(amount);
xc_currentHealth = std::min(health, xc_currentHealth + amount);
xc_health.SetHP(std::min(health, xc_health.GetHP() + amount));
}
default:
break;