AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-21 07:39:13 +00:00
Code Issues Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Phillip Stephens
2023-06-21 13:22:49 -07:00
parent 7195b87ce6
commit d29df977f3
15 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/World/CShockWave.cpp
View File

@@ -14,7 +14,7 @@
namespace metaforce::MP1 {
CShockWave::CShockWave(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
TUniqueId parent, const SShockWaveData& data, float minActiveTime, float knockback)
TUniqueId parent, const CShockWaveInfo& data, float minActiveTime, float knockback)
: CActor(uid, true, name, info, xf, CModelData::CModelDataNull(), {EMaterialTypes::Projectile},
CActorParameters::None(), kInvalidUniqueId)
, xe8_parentId(parent)
@@ -148,7 +148,7 @@ void CShockWave::Touch(CActor& actor, CStateManager& mgr) {
if (isPlayer && (x164_timeSinceHitPlayerInAir >= 0.1333f || x168_timeSinceHitPlayer >= 0.2666f)) {
return;
}
if (!IsHit(actor.GetUniqueId())) {
if (!WasAlreadyDamaged(actor.GetUniqueId())) {
mgr.ApplyDamage(GetUniqueId(), actor.GetUniqueId(), GetUniqueId(), damageInfo,
CMaterialFilter::MakeInclude({EMaterialTypes::Solid}), zeus::skZero3f);
if (isPlayer && x974_electricDesc) {
@@ -172,7 +172,7 @@ void CShockWave::Touch(CActor& actor, CStateManager& mgr) {
}
}
bool CShockWave::IsHit(TUniqueId id) const {
bool CShockWave::WasAlreadyDamaged(TUniqueId id) const {
return std::find(x170_hitIds.begin(), x170_hitIds.end(), id) != x170_hitIds.end();
}
} // namespace metaforce::MP1