2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:07:42 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -2,33 +2,29 @@
#include "CTransition.hpp"
#include "CHalfTransition.hpp"
namespace urde
{
namespace urde {
CTransitionDatabaseGame::CTransitionDatabaseGame(const std::vector<CTransition>& transitions,
const std::vector<CHalfTransition>& halfTransitions,
const std::shared_ptr<IMetaTrans>& defaultTrans)
: x10_defaultTrans(defaultTrans)
{
x14_transitions.reserve(transitions.size());
for (const CTransition& trans : transitions)
x14_transitions.emplace_back(trans.GetAnimPair(), trans.GetMetaTrans());
: x10_defaultTrans(defaultTrans) {
x14_transitions.reserve(transitions.size());
for (const CTransition& trans : transitions)
x14_transitions.emplace_back(trans.GetAnimPair(), trans.GetMetaTrans());
x24_halfTransitions.reserve(halfTransitions.size());
for (const CHalfTransition& trans : halfTransitions)
x24_halfTransitions.emplace_back(trans.GetId(), trans.GetMetaTrans());
x24_halfTransitions.reserve(halfTransitions.size());
for (const CHalfTransition& trans : halfTransitions)
x24_halfTransitions.emplace_back(trans.GetId(), trans.GetMetaTrans());
}
const std::shared_ptr<IMetaTrans>& CTransitionDatabaseGame::GetMetaTrans(u32 a, u32 b) const
{
auto it = std::find_if(x14_transitions.cbegin(), x14_transitions.cend(),
[&](const std::pair<std::pair<u32, u32>, std::shared_ptr<IMetaTrans>>& elem) -> bool
{
return elem.first.first == a && elem.first.second == b;
});
if (it != x14_transitions.cend())
return it->second;
return x10_defaultTrans;
const std::shared_ptr<IMetaTrans>& CTransitionDatabaseGame::GetMetaTrans(u32 a, u32 b) const {
auto it = std::find_if(x14_transitions.cbegin(), x14_transitions.cend(),
[&](const std::pair<std::pair<u32, u32>, std::shared_ptr<IMetaTrans>>& elem) -> bool {
return elem.first.first == a && elem.first.second == b;
});
if (it != x14_transitions.cend())
return it->second;
return x10_defaultTrans;
}
}
} // namespace urde