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

Various knockback related fixes, don't call WaitForComplete in CGameaArea

Browse Source
This commit is contained in:
Phillip Stephens
2021-06-13 18:06:29 -07:00
parent ace87397d7
commit 933279ceb6
7 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/MP1/World/CMetroidPrimeExo.cpp
View File

@@ -1815,11 +1815,11 @@ void CMetroidPrimeExo::UpdateBoneTracking(float dt, CStateManager& mgr) {
}
void CMetroidPrimeExo::DoContactDamage(TUniqueId uid, CStateManager& mgr) {
if (TCastToConstPtr<CCollisionActor> colAct = mgr.GetObjectById(uid)) {
if (!IsAlive()) {
return;
}
if (!IsAlive()) {
return;
}
if (TCastToConstPtr<CCollisionActor> colAct = mgr.GetObjectById(uid)) {
if (colAct->GetLastTouchedObject() == mgr.GetPlayer().GetUniqueId()) {
if (mgr.GetPlayer().GetFrozenState()) {
mgr.GetPlayer().UnFreeze(mgr);