AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Runtime: Make use of std::make_unique where applicable

Browse Source 
Makes use of the C++14 make_unique allocation function to allocate class
instances where applicable instead of a reset with a new operator within
it.

This doesn't touch cases where buffers are allocated, given make_unique
would zero-initialize them.
This commit is contained in:
Lioncash
2019-09-11 23:50:38 -04:00
parent d6166ad666
commit f9079f0215
42 changed files with 227 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Runtime/Character/CParticleDatabase.cpp
View File

@@ -336,16 +336,15 @@ void CParticleDatabase::AddAuxiliaryParticleEffect(std::string_view name, int fl
else
scaleVec = scale * data.GetScale();
std::unique_ptr<CParticleGenInfo> newGen;
switch (data.GetTag().type.toUint32()) {
case SBIG('PART'): {
auto search = x0_particleDescs.find(data.GetTag().id);
if (search != x0_particleDescs.end()) {
const auto search = x0_particleDescs.find(data.GetTag().id);
if (search != x0_particleDescs.cend()) {
auto sys = std::make_shared<CElementGen>(*search->second);
newGen = std::make_unique<CParticleGenInfoGeneric>(data.GetTag(), sys, data.GetDuration(), "NOT_A_VALID_LOCATOR",
scaleVec, CParticleData::EParentedMode::Initial, flags, mgr,
aid, lightId + _getGraphicLightId(sys, *search->second),
EParticleGenType::Auxiliary);
auto newGen = std::make_unique<CParticleGenInfoGeneric>(
data.GetTag(), sys, data.GetDuration(), "NOT_A_VALID_LOCATOR", scaleVec,
CParticleData::EParentedMode::Initial, flags, mgr, aid, lightId + _getGraphicLightId(sys, *search->second),
EParticleGenType::Auxiliary);
newGen->SetGlobalTranslation(data.GetTranslation(), mgr);
newGen->SetIsGrabInitialData(false);
@@ -380,8 +379,8 @@ void CParticleDatabase::AddParticleEffect(std::string_view name, int flags, cons
std::unique_ptr<CParticleGenInfo> newGen;
switch (data.GetTag().type.toUint32()) {
case SBIG('PART'): {
auto search = x0_particleDescs.find(data.GetTag().id);
if (search != x0_particleDescs.end()) {
const auto search = x0_particleDescs.find(data.GetTag().id);
if (search != x0_particleDescs.cend()) {
auto sys = std::make_shared<CElementGen>(*search->second);
newGen = std::make_unique<CParticleGenInfoGeneric>(
data.GetTag(), sys, data.GetDuration(), data.GetSegmentName(), scaleVec, data.GetParentedMode(), flags, mgr,
@@ -390,8 +389,8 @@ void CParticleDatabase::AddParticleEffect(std::string_view name, int flags, cons
break;
}
case SBIG('SWHC'): {
auto search = x14_swooshDescs.find(data.GetTag().id);
if (search != x14_swooshDescs.end()) {
const auto search = x14_swooshDescs.find(data.GetTag().id);
if (search != x14_swooshDescs.cend()) {
auto sys = std::make_shared<CParticleSwoosh>(*search->second, 0);
newGen = std::make_unique<CParticleGenInfoGeneric>(data.GetTag(), sys, data.GetDuration(), data.GetSegmentName(),
scaleVec, data.GetParentedMode(), flags, mgr, aid, -1,
@@ -400,8 +399,8 @@ void CParticleDatabase::AddParticleEffect(std::string_view name, int flags, cons
break;
}
case SBIG('ELSC'): {
auto search = x28_electricDescs.find(data.GetTag().id);
if (search != x28_electricDescs.end()) {
const auto search = x28_electricDescs.find(data.GetTag().id);
if (search != x28_electricDescs.cend()) {
auto sys = std::make_shared<CParticleElectric>(*search->second);
newGen = std::make_unique<CParticleGenInfoGeneric>(
data.GetTag(), sys, data.GetDuration(), data.GetSegmentName(), scaleVec, data.GetParentedMode(), flags, mgr,