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

Implement CKnockBackController

Browse Source
This commit is contained in:
Jack Andersen
2018-11-04 20:12:53 -10:00
parent 4c306e7e40
commit d6051f8808
39 changed files with 947 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ CParasite::CParasite(TUniqueId uid, std::string_view name, EFlavorType flavor, c
bool b1, u32 w1, const CDamageVulnerability& dVuln,const CDamageInfo& parInfo, u16 sfxId1,
u16 sfxId2, u16 sfxId3, u32 w2, u32 w3, float f19, const CActorParameters &aParams)
: CWallWalker(ECharacter::Parasite, uid, name, flavor, info, xf, std::move(mData), pInfo, EMovementType::Flyer,
EColliderType::Zero, bodyType, aParams, f7, f4, 0, f2, w1, f17, b1)
EColliderType::Zero, bodyType, aParams, f7, f4, EKnockBackVariant::Zero, f2, w1, f17, b1)
, x64c_(dVuln)
, x6b4_(parInfo)
, x6d0_(f1)
@@ -53,9 +53,9 @@ CParasite::CParasite(TUniqueId uid, std::string_view name, EFlavorType flavor, c
switch(x5d0_)
{
case 2:
//x460_.x81_25_ = false;
x460_knockBackController.SetX81_25(false);
case 1:
//x460_.sub80233d64(false);
x460_knockBackController.SetAutoResetImpulse(false);
break;
case 3:
@@ -163,7 +163,7 @@ void CParasite::Think(float dt, CStateManager& mgr)
}
}
if (x400_25_)
if (x400_25_alive)
{
CPlayer* pl = mgr.Player();
float radius;