diff --git a/Runtime/Character/CTransitionDatabaseGame.cpp b/Runtime/Character/CTransitionDatabaseGame.cpp index c29369ce4..37a09bbdc 100644 --- a/Runtime/Character/CTransitionDatabaseGame.cpp +++ b/Runtime/Character/CTransitionDatabaseGame.cpp @@ -27,14 +27,18 @@ CTransitionDatabaseGame::CTransitionDatabaseGame(const std::vector& } const std::shared_ptr& CTransitionDatabaseGame::GetMetaTrans(u32 a, u32 b) const { - auto it = rstl::binary_find(x14_transitions.cbegin(), x14_transitions.cend(), std::make_pair(a, b), - [](const std::pair, std::shared_ptr>& p) { return p.first; }); - if (it != x14_transitions.cend()) + const auto it = rstl::binary_find(x14_transitions.cbegin(), x14_transitions.cend(), std::make_pair(a, b), + [](const auto& p) { return p.first; }); + if (it != x14_transitions.cend()) { return it->second; - auto it2 = rstl::binary_find(x24_halfTransitions.cbegin(), x24_halfTransitions.cend(), b, - [](const std::pair>& p) { return p.first; }); - if (it2 != x24_halfTransitions.cend()) + } + + const auto it2 = rstl::binary_find(x24_halfTransitions.cbegin(), x24_halfTransitions.cend(), b, + [](const auto& p) { return p.first; }); + if (it2 != x24_halfTransitions.cend()) { return it2->second; + } + return x10_defaultTrans; }