diff --git a/Runtime/Character/CTransitionDatabaseGame.cpp b/Runtime/Character/CTransitionDatabaseGame.cpp index 90adebe62..16b87b581 100644 --- a/Runtime/Character/CTransitionDatabaseGame.cpp +++ b/Runtime/Character/CTransitionDatabaseGame.cpp @@ -18,12 +18,14 @@ CTransitionDatabaseGame::CTransitionDatabaseGame(const std::vector& } const std::shared_ptr& CTransitionDatabaseGame::GetMetaTrans(u32 a, u32 b) const { - auto it = std::find_if(x14_transitions.cbegin(), x14_transitions.cend(), - [&](const std::pair, std::shared_ptr>& elem) -> bool { - return elem.first.first == a && elem.first.second == b; - }); + 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()) 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()) + return it2->second; return x10_defaultTrans; } diff --git a/Runtime/World/CScriptPlatform.cpp b/Runtime/World/CScriptPlatform.cpp index 900521ad5..8037d110a 100644 --- a/Runtime/World/CScriptPlatform.cpp +++ b/Runtime/World/CScriptPlatform.cpp @@ -255,7 +255,8 @@ void CScriptPlatform::Think(float dt, CStateManager& mgr) { if (!x356_25_notAnimating) UpdateAnimation(dt, mgr, true); if (x356_28_rainSplashes && mgr.GetWorld()->GetNeededEnvFx() == EEnvFxType::Rain) { - if (HasModelData() && !GetModelData()->IsNull() && mgr.GetEnvFxManager()->GetRainMagnitude() != 0.f) + if (HasModelData() && !GetModelData()->IsNull() && mgr.GetEnvFxManager()->IsSplashActive() && + mgr.GetEnvFxManager()->GetRainMagnitude() != 0.f) mgr.GetActorModelParticles()->AddRainSplashGenerator(*this, mgr, x34c_maxRainSplashes, x350_rainGenRate, 0.f); } } diff --git a/hecl b/hecl index ad075d532..8393970b8 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit ad075d532e478c0f90b86200828ef7585050c817 +Subproject commit 8393970b82fabcf604be5935368a77b949416ebb