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

CMagdolite: Fix SetupCollisionActors

This commit is contained in:
Luke Street 2020-04-21 02:15:02 -04:00
parent 5f66ab2219
commit b4dad2adf5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/MP1/World/CMagdolite.cpp
View File

@ -172,7 +172,7 @@ void CMagdolite::SetupCollisionActors(CStateManager& mgr) {
for (int i = 0; i < x580_collisionManager->GetNumCollisionActors(); ++i) { for (int i = 0; i < x580_collisionManager->GetNumCollisionActors(); ++i) {
const auto& desc = x580_collisionManager->GetCollisionDescFromIndex(i); const auto& desc = x580_collisionManager->GetCollisionDescFromIndex(i);
if (desc.GetName().compare("Top_LCTR"sv) != 0 && desc.GetName().compare("Bottom_LCTR"sv) != 0) { if (desc.GetName() == "Top_LCTR"sv || desc.GetName() == "Bottom_LCTR"sv) {
if (TCastToPtr<CCollisionActor> colAct = mgr.ObjectById(desc.GetCollisionActorId())) { if (TCastToPtr<CCollisionActor> colAct = mgr.ObjectById(desc.GetCollisionActorId())) {
colAct->AddMaterial(EMaterialTypes::ProjectilePassthrough, mgr); colAct->AddMaterial(EMaterialTypes::ProjectilePassthrough, mgr);
x69c_.push_back(colAct->GetUniqueId()); x69c_.push_back(colAct->GetUniqueId());
@ -577,8 +577,7 @@ bool CMagdolite::Leash(CStateManager& mgr, float arg) {
} }
bool CMagdolite::HasAttackPattern(CStateManager& mgr, float arg) { bool CMagdolite::HasAttackPattern(CStateManager& mgr, float arg) {
bool ret = FindSuitableTarget(mgr, EScriptObjectState::Attack, EScriptObjectMessage::Follow) != kInvalidUniqueId; return FindSuitableTarget(mgr, EScriptObjectState::Attack, EScriptObjectMessage::Follow) != kInvalidUniqueId;
return ret;
} }
bool CMagdolite::LineOfSight(CStateManager& mgr, float arg) { bool CMagdolite::LineOfSight(CStateManager& mgr, float arg) {