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

CDrone: Reset shieldTime in GetCollisionResponseType

This commit is contained in:
Luke Street 2020-09-13 19:30:21 -04:00
parent ffe0cf7ca2
commit a0d7f126e9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Runtime/MP1/World/CDrone.cpp
View File

@ -347,6 +347,7 @@ void CDrone::Touch(CActor& act, CStateManager& mgr) {
EWeaponCollisionResponseTypes CDrone::GetCollisionResponseType(const zeus::CVector3f&, const zeus::CVector3f& dir, EWeaponCollisionResponseTypes CDrone::GetCollisionResponseType(const zeus::CVector3f&, const zeus::CVector3f& dir,
const CWeaponMode&, EProjectileAttrib) const { const CWeaponMode&, EProjectileAttrib) const {
if (x3fc_flavor == EFlavorType::One && HitShield(-dir)) { if (x3fc_flavor == EFlavorType::One && HitShield(-dir)) {
x5e8_shieldTime = 1.f;
return EWeaponCollisionResponseTypes::Unknown86; return EWeaponCollisionResponseTypes::Unknown86;
} }
return EWeaponCollisionResponseTypes::Unknown36; return EWeaponCollisionResponseTypes::Unknown36;

2
Runtime/MP1/World/CDrone.hpp
View File

@ -25,7 +25,7 @@ class CDrone : public CPatterned {
float x5dc_ = 0.f; float x5dc_ = 0.f;
float x5e0_ = 0.f; float x5e0_ = 0.f;
float x5e4_; float x5e4_;
float x5e8_shieldTime = 0.f; mutable float x5e8_shieldTime = 0.f;
float x5ec_turnSpeed; float x5ec_turnSpeed;
float x5f0_; float x5f0_;
float x5f4_; float x5f4_;