From e855cbd902e7862684de79c5aa9a8a8849f06705 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 20 Aug 2019 06:58:13 -0700 Subject: [PATCH] Update hecl, fix CFlickerBat's targetable state being inverted --- Runtime/MP1/World/CFlickerBat.cpp | 8 +++----- hecl | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Runtime/MP1/World/CFlickerBat.cpp b/Runtime/MP1/World/CFlickerBat.cpp index d462ff3cd..1eee4cb4f 100644 --- a/Runtime/MP1/World/CFlickerBat.cpp +++ b/Runtime/MP1/World/CFlickerBat.cpp @@ -88,11 +88,9 @@ void CFlickerBat::Think(float dt, CStateManager& mgr) { x42c_color.a() = alpha; x94_simpleShadow->SetUserAlpha(alpha); - bool targetable = true; - if (mgr.GetPlayerState()->GetCurrentVisor() != CPlayerState::EPlayerVisor::XRay && - (x574_state == EFlickerBatState::Visible || x574_state == EFlickerBatState::FadeIn)) - targetable = false; - xe7_31_targetable = targetable; + xe7_31_targetable = (mgr.GetPlayerState()->GetCurrentVisor() == CPlayerState::EPlayerVisor::XRay + ? true + : x574_state == EFlickerBatState::Visible || x574_state == EFlickerBatState::FadeIn); CPatterned::Think(dt, mgr); } diff --git a/hecl b/hecl index de482c8fa..875a3fc1f 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit de482c8facd934f5d0a2a541b292af3f2b833b30 +Subproject commit 875a3fc1f23d00859f025176ff0c418ba5d5ebf0