AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-15 19:11:27 +00:00
Code Issues Projects Releases Wiki Activity

CElitePirate/etc: Use prefix increment/decrement

Browse Source
This commit is contained in:
Luke Street 2020-04-01 15:01:44 -04:00
parent bb7699be46
commit 0c1f4fa738
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/World/CBouncyGrenade.cpp
View File

@ -87,7 +87,7 @@ void CBouncyGrenade::CollidedWith(TUniqueId id, const CCollisionInfoList& list,
ApplyImpulseWR(impulse, angle); ApplyImpulseWR(impulse, angle);
CSfxManager::AddEmitter(x258_data.GetBounceSfx(), GetTranslation(), zeus::skUp, false, false, 0x7f, CSfxManager::AddEmitter(x258_data.GetBounceSfx(), GetTranslation(), zeus::skUp, false, false, 0x7f,
GetAreaIdAlways()); GetAreaIdAlways());
x294_numBounces--; --x294_numBounces;
} }
break; break;
} }

2
Runtime/MP1/World/CElitePirate.cpp
View File

@ -341,7 +341,7 @@ void CElitePirate::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node
case EUserEventType::BecomeShootThrough: case EUserEventType::BecomeShootThrough:
if (HasWeakPointHead()) { if (HasWeakPointHead()) {
u32 numCollisionActors = x730_collisionActorMgrHead->GetNumCollisionActors(); u32 numCollisionActors = x730_collisionActorMgrHead->GetNumCollisionActors();
for (u32 i = 0; i < numCollisionActors; i++) { for (u32 i = 0; i < numCollisionActors; ++i) {
const auto& description = x730_collisionActorMgrHead->GetCollisionDescFromIndex(i); const auto& description = x730_collisionActorMgrHead->GetCollisionDescFromIndex(i);
if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(description.GetCollisionActorId())) { if (TCastToPtr<CCollisionActor> actor = mgr.ObjectById(description.GetCollisionActorId())) {
actor->AddMaterial(EMaterialTypes::ProjectilePassthrough, mgr); actor->AddMaterial(EMaterialTypes::ProjectilePassthrough, mgr);

2
Runtime/MP1/World/CGrenadeLauncher.cpp
View File

@ -31,7 +31,7 @@ CGrenadeLauncher::CGrenadeLauncher(TUniqueId uid, std::string_view name, const C
} }
GetModelData()->EnableLooping(true); GetModelData()->EnableLooping(true);
const CPASDatabase& pasDatabase = GetModelData()->GetAnimationData()->GetCharacterInfo().GetPASDatabase(); const CPASDatabase& pasDatabase = GetModelData()->GetAnimationData()->GetCharacterInfo().GetPASDatabase();
for (int i = 0; i < x3c8_animIds.size(); i++) { for (int i = 0; i < x3c8_animIds.size(); ++i) {
const auto result = pasDatabase.FindBestAnimation({22, CPASAnimParm::FromEnum(i)}, -1); const auto result = pasDatabase.FindBestAnimation({22, CPASAnimParm::FromEnum(i)}, -1);
x3c8_animIds[i] = result.second; x3c8_animIds[i] = result.second;
} }

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

@ -77,7 +77,7 @@ void CShockWave::Think(float dt, CStateManager& mgr) {
x150_ += x154_ * dt; x150_ += x154_ * dt;
x154_ += dt * x114_data.GetX30(); x154_ += dt * x114_data.GetX30();
x110_elementGen->SetExternalVar(0, x150_); x110_elementGen->SetExternalVar(0, x150_);
for (int i = 0; i < x110_elementGen->GetNumActiveChildParticles(); i++) { for (int i = 0; i < x110_elementGen->GetNumActiveChildParticles(); ++i) {
auto& particle = static_cast<CElementGen&>(x110_elementGen->GetActiveChildParticle(i)); auto& particle = static_cast<CElementGen&>(x110_elementGen->GetActiveChildParticle(i));
if (particle.Get4CharId() == SBIG('PART')) { if (particle.Get4CharId() == SBIG('PART')) {
particle.SetExternalVar(0, x150_); particle.SetExternalVar(0, x150_);