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

CWallCrawlerSwarm: Mark static const data as constexpr 

Same behavior, but allows elision of initializers. While we're at it, we
can convert an array over to std::array.
This commit is contained in:
Lioncash 2020-03-30 05:44:10 -04:00
parent 312b8f219a
commit 7ff3d29794
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/World/CWallCrawlerSwarm.cpp
View File

@ -1,5 +1,7 @@
#include "Runtime/World/CWallCrawlerSwarm.hpp" #include "Runtime/World/CWallCrawlerSwarm.hpp"
#include <array>
#include "Runtime/CSimplePool.hpp" #include "Runtime/CSimplePool.hpp"
#include "Runtime/CStateManager.hpp" #include "Runtime/CStateManager.hpp"
#include "Runtime/GameGlobalObjects.hpp" #include "Runtime/GameGlobalObjects.hpp"
@ -598,14 +600,14 @@ void CWallCrawlerSwarm::LaunchBoid(CBoid& boid, const zeus::CVector3f& dir) {
CSfxManager::AddEmitter(x55c_launchSfx, pos, zeus::skZero3f, true, false, 0x7f, x4_areaId); CSfxManager::AddEmitter(x55c_launchSfx, pos, zeus::skZero3f, true, false, 0x7f, x4_areaId);
} }
static const int kParticleCounts[] = {8, 2, 0, 0};
void CWallCrawlerSwarm::AddParticle(const zeus::CTransform& xf) { void CWallCrawlerSwarm::AddParticle(const zeus::CTransform& xf) {
int i = 0; static constexpr std::array particleCounts{8, 2, 0, 0};
size_t i = 0;
for (auto& p : x524_particleGens) { for (auto& p : x524_particleGens) {
p->SetParticleEmission(true); p->SetParticleEmission(true);
p->SetTranslation(xf.origin); p->SetTranslation(xf.origin);
p->ForceParticleCreation(kParticleCounts[i]); p->ForceParticleCreation(particleCounts[i]);
p->SetParticleEmission(false); p->SetParticleEmission(false);
++i; ++i;
} }
@ -863,7 +865,7 @@ void CWallCrawlerSwarm::Think(float dt, CStateManager& mgr) {
if (x558_flavor == EFlavor::Parasite && x554_maxLaunches > 0) { if (x558_flavor == EFlavor::Parasite && x554_maxLaunches > 0) {
zeus::CVector3f _383c = mgr.GetPlayer().GetTranslation() + zeus::skUp; zeus::CVector3f _383c = mgr.GetPlayer().GetTranslation() + zeus::skUp;
static const CMaterialFilter filter = CMaterialFilter::MakeInclude(EMaterialTypes::Solid); static constexpr auto filter = CMaterialFilter::MakeInclude(EMaterialTypes::Solid);
int numLaunched = 0; int numLaunched = 0;
for (auto& b : x108_boids) { for (auto& b : x108_boids) {
if (b.GetActive() && b.x80_26_launched) if (b.GetActive() && b.x80_26_launched)