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

Work on CGameProjectile

Browse Source
This commit is contained in:
Jack Andersen
2018-02-08 21:12:26 -10:00
parent ae6797f24b
commit 083571e693
22 changed files with 446 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CPlayer.cpp
View File

@@ -2092,7 +2092,7 @@ void CPlayer::CalculatePlayerMovementDirection(float dt)
x500_lookDir.normalize();
}
void CPlayer::Stop(CStateManager& stateMgr)
void CPlayer::UnFreeze(CStateManager& stateMgr)
{
if (GetFrozenState())
{
@@ -2163,11 +2163,11 @@ void CPlayer::UpdateFrozenState(const CFinalInput& input, CStateManager& mgr)
if (x750_frozenTimeout > 0.f)
SetVisorSteam(0.7f, 0.42857146f, 0.071428575f, xa08_steamTextureId, false);
else
Stop(mgr);
UnFreeze(mgr);
if (x258_movementState == EPlayerMovementState::OnGround ||
x258_movementState == EPlayerMovementState::FallingMorphed)
{
Stop(mgr);
UnFreeze(mgr);
ClearForcesAndTorques();
}
x7a0_visorSteam.Update(input.DeltaTime());
@@ -2200,7 +2200,7 @@ void CPlayer::UpdateFrozenState(const CFinalInput& input, CStateManager& mgr)
g_GameState->SystemOptions().IncrementFrozenFpsCount();
CHUDMemoParms info(0.f, true, true, true);
MP1::CSamusHud::DisplayHudMemo(u"", info);
Stop(mgr);
UnFreeze(mgr);
}
}
break;