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

Initial collision testing and CStateManager work

Browse Source
This commit is contained in:
Jack Andersen
2017-03-30 12:36:18 -10:00
parent a0549cd82b
commit 2530163a8c
38 changed files with 1056 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/CPlayer.cpp
View File

@@ -47,9 +47,9 @@ void CPlayer::Update(float, CStateManager& mgr) {}
bool CPlayer::IsPlayerDeadEnough() const
{
if (x2f8_morphTransState == CPlayer::EPlayerMorphBallState::Unmorphed)
return x9f4_deathTime < 2.5f;
return x9f4_deathTime > 2.5f;
else if (x2f8_morphTransState == CPlayer::EPlayerMorphBallState::Morphed)
return x9f4_deathTime < 6.f;
return x9f4_deathTime > 6.f;
return false;
}