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

Merge pull request #266 from lioncash/make 

CParticleElectric: Use std::make_unique where applicable
This commit is contained in:
Phillip Stephens 2020-03-23 23:28:59 -07:00 committed by GitHub
parent 498df6588b 34a0e9f23d
commit bb9359c579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/Particle/CParticleElectric.cpp
View File

@ -42,7 +42,7 @@ CParticleElectric::CParticleElectric(const TToken<CElectricDescription>& token)
if (desc->x40_SSWH) { if (desc->x40_SSWH) {
x450_27_haveSSWH = true; x450_27_haveSSWH = true;
for (int i = 0; i < x154_SCNT; ++i) { for (int i = 0; i < x154_SCNT; ++i) {
x1e0_swooshGenerators.emplace_back(new CParticleSwoosh(desc->x40_SSWH.m_token, x150_SSEG)); x1e0_swooshGenerators.emplace_back(std::make_unique<CParticleSwoosh>(desc->x40_SSWH.m_token, x150_SSEG));
x1e0_swooshGenerators.back()->DoElectricWarmup(); x1e0_swooshGenerators.back()->DoElectricWarmup();
} }
} }
@ -56,7 +56,7 @@ CParticleElectric::CParticleElectric(const TToken<CElectricDescription>& token)
x450_25_haveGPSM = true; x450_25_haveGPSM = true;
x400_gpsmGenerators.reserve(x154_SCNT); x400_gpsmGenerators.reserve(x154_SCNT);
for (int i = 0; i < x154_SCNT; ++i) { for (int i = 0; i < x154_SCNT; ++i) {
x400_gpsmGenerators.emplace_back(new CElementGen(desc->x50_GPSM.m_token)); x400_gpsmGenerators.emplace_back(std::make_unique<CElementGen>(desc->x50_GPSM.m_token));
x400_gpsmGenerators.back()->SetParticleEmission(false); x400_gpsmGenerators.back()->SetParticleEmission(false);
} }
} }
@ -65,15 +65,16 @@ CParticleElectric::CParticleElectric(const TToken<CElectricDescription>& token)
x450_26_haveEPSM = true; x450_26_haveEPSM = true;
x410_epsmGenerators.reserve(x154_SCNT); x410_epsmGenerators.reserve(x154_SCNT);
for (int i = 0; i < x154_SCNT; ++i) { for (int i = 0; i < x154_SCNT; ++i) {
x410_epsmGenerators.emplace_back(new CElementGen(desc->x60_EPSM.m_token)); x410_epsmGenerators.emplace_back(std::make_unique<CElementGen>(desc->x60_EPSM.m_token));
x410_epsmGenerators.back()->SetParticleEmission(false); x410_epsmGenerators.back()->SetParticleEmission(false);
} }
} }
if (x1c_elecDesc->x28_LWD1 || x1c_elecDesc->x2c_LWD2 || x1c_elecDesc->x30_LWD3) { if (x1c_elecDesc->x28_LWD1 || x1c_elecDesc->x2c_LWD2 || x1c_elecDesc->x30_LWD3) {
x450_28_haveLWD = true; x450_28_haveLWD = true;
for (int i = 0; i < x154_SCNT; ++i) for (int i = 0; i < x154_SCNT; ++i) {
x2e4_lineManagers.emplace_back(new CLineManager()); x2e4_lineManagers.emplace_back(std::make_unique<CLineManager>());
}
} }
} }