AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CAtomicBeta: Some member renaming

This commit is contained in:
Luke Street 2020-08-24 03:59:30 -04:00
parent a224d27043
commit f96a02e7ae
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Runtime/MP1/World/CAtomicBeta.cpp
View File

@ -24,12 +24,12 @@ CAtomicBeta::CAtomicBeta(TUniqueId uid, std::string_view name, const CEntityInfo
float f6, s16 sId1, s16 sId2, s16 sId3, float f7) float f6, s16 sId1, s16 sId2, s16 sId3, float f7)
: CPatterned(ECharacter::AtomicBeta, uid, name, EFlavorType::Zero, info, xf, std::move(mData), pInfo, : CPatterned(ECharacter::AtomicBeta, uid, name, EFlavorType::Zero, info, xf, std::move(mData), pInfo,
EMovementType::Flyer, EColliderType::One, EBodyType::RestrictedFlyer, actParms, EKnockBackVariant::Small) EMovementType::Flyer, EColliderType::One, EBodyType::RestrictedFlyer, actParms, EKnockBackVariant::Small)
, x578_(f5) , x578_minSpeed(f5)
, x57c_(f6) , x57c_maxSpeed(f6)
, x580_(f7) , x580_speedStep(f7)
, x584_(x578_) , x584_currentSpeed(x578_minSpeed)
, x588_frozenDamage(dVuln) , x588_frozenDamage(dVuln)
, x5f0_(f4) , x5f0_moveSpeed(f4)
, x5f4_(xf.basis[1]) , x5f4_(xf.basis[1])
, x600_electricWeapon(g_SimplePool->GetObj({SBIG('ELSC'), electricId})) , x600_electricWeapon(g_SimplePool->GetObj({SBIG('ELSC'), electricId}))
, x608_(g_SimplePool->GetObj({SBIG('WPSC'), weaponId})) , x608_(g_SimplePool->GetObj({SBIG('WPSC'), weaponId}))
@ -148,10 +148,10 @@ void CAtomicBeta::Think(float dt, CStateManager& mgr) {
} }
} }
float speed = x580_ * (dt * (IsPlayerBeamChargedEnough(mgr) ? 1.f : -1.f)) + x584_; float speed = x580_speedStep * (dt * (IsPlayerBeamChargedEnough(mgr) ? 1.f : -1.f)) + x584_currentSpeed;
x584_ = zeus::clamp(x578_, speed, x57c_); x584_currentSpeed = zeus::clamp(x578_minSpeed, speed, x57c_maxSpeed);
x3b4_speed = x584_; x3b4_speed = x584_currentSpeed;
x450_bodyController->SetRestrictedFlyerMoveSpeed(x5f0_ * x584_); x450_bodyController->SetRestrictedFlyerMoveSpeed(x5f0_moveSpeed * x584_currentSpeed);
} }
const CDamageVulnerability* CAtomicBeta::GetDamageVulnerability() const { const CDamageVulnerability* CAtomicBeta::GetDamageVulnerability() const {

12
Runtime/MP1/World/CAtomicBeta.hpp
View File

@ -16,12 +16,12 @@ class CAtomicBeta final : public CPatterned {
static constexpr u32 kBombCount = 3; static constexpr u32 kBombCount = 3;
rstl::reserved_vector<TUniqueId, kBombCount> x568_projectileIds; rstl::reserved_vector<TUniqueId, kBombCount> x568_projectileIds;
bool x574_beamFired = false; bool x574_beamFired = false;
float x578_; float x578_minSpeed;
float x57c_; float x57c_maxSpeed;
float x580_; float x580_speedStep;
float x584_; float x584_currentSpeed;
CDamageVulnerability x588_frozenDamage; CDamageVulnerability x588_frozenDamage;
float x5f0_; float x5f0_moveSpeed;
zeus::CVector3f x5f4_; zeus::CVector3f x5f4_;
TToken<CElectricDescription> x600_electricWeapon; TToken<CElectricDescription> x600_electricWeapon;
TToken<CWeaponDescription> x608_; TToken<CWeaponDescription> x608_;
@ -63,4 +63,4 @@ public:
void Death(CStateManager&, const zeus::CVector3f&, EScriptObjectState) override; void Death(CStateManager&, const zeus::CVector3f&, EScriptObjectState) override;
static bool IsPlayerBeamChargedEnough(const CStateManager& mgr); static bool IsPlayerBeamChargedEnough(const CStateManager& mgr);
}; };
} // namespace urde::MP1 } // namespace urde::MP1