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

General: Make use of emplace_back where applicable

This commit is contained in:
Lioncash 2020-03-31 05:32:06 -04:00
parent 7b9018dbf0
commit 2f0d774ed8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Camera/CCinematicCamera.cpp
View File

@ -296,11 +296,11 @@ void CCinematicCamera::GenerateMoveOutofIntoPoints(bool outOfEye, CStateManager&
behindDelta = -behindDelta;
}
for (int i = 0; i < 2; ++i) {
x188_viewPoints.push_back(behindPos);
x198_viewOrientations.push_back(q);
x1a8_viewPointArrivals.push_back(mgr.GetPlayer().GetUniqueId());
x1b8_targets.push_back(eyePos);
x1c8_targetArrivals.push_back(kInvalidUniqueId);
x188_viewPoints.emplace_back(behindPos);
x198_viewOrientations.emplace_back(q);
x1a8_viewPointArrivals.emplace_back(mgr.GetPlayer().GetUniqueId());
x1b8_targets.emplace_back(eyePos);
x1c8_targetArrivals.emplace_back(kInvalidUniqueId);
behindPos += behindDelta;
}
CalculateMoveOutofIntoEyePosition(outOfEye, mgr);

8
Runtime/Character/CBodyStateInfo.cpp
View File

@ -42,10 +42,10 @@ CBodyStateInfo::CBodyStateInfo(CActor& actor, EBodyType type) {
}
x1c_additiveStates.reserve(4);
x1c_additiveStates.push_back({pas::EAnimationState::AdditiveIdle, std::make_unique<CABSIdle>()});
x1c_additiveStates.push_back({pas::EAnimationState::AdditiveAim, std::make_unique<CABSAim>()});
x1c_additiveStates.push_back({pas::EAnimationState::AdditiveFlinch, std::make_unique<CABSFlinch>()});
x1c_additiveStates.push_back({pas::EAnimationState::AdditiveReaction, std::make_unique<CABSReaction>()});
x1c_additiveStates.emplace_back(pas::EAnimationState::AdditiveIdle, std::make_unique<CABSIdle>());
x1c_additiveStates.emplace_back(pas::EAnimationState::AdditiveAim, std::make_unique<CABSAim>());
x1c_additiveStates.emplace_back(pas::EAnimationState::AdditiveFlinch, std::make_unique<CABSFlinch>());
x1c_additiveStates.emplace_back(pas::EAnimationState::AdditiveReaction, std::make_unique<CABSReaction>());
}
std::unique_ptr<CBodyState> CBodyStateInfo::SetupRestrictedFlyerBodyStates(int stateId, CActor& actor) const {