From d6e8d373ac5aad883539753948739c435891ff03 Mon Sep 17 00:00:00 2001 From: Henrique Gemignani Passos Lima Date: Thu, 20 Oct 2022 18:23:38 +0300 Subject: [PATCH] Decomp fix for CScriptTrigger::Touch --- Runtime/World/CScriptTrigger.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Runtime/World/CScriptTrigger.cpp b/Runtime/World/CScriptTrigger.cpp index 92d916d80..c991e74cb 100644 --- a/Runtime/World/CScriptTrigger.cpp +++ b/Runtime/World/CScriptTrigger.cpp @@ -233,8 +233,10 @@ void CScriptTrigger::Touch(CActor& act, CStateManager& mgr) { auto testFlags = ETriggerFlags::None; const TCastToPtr pl(act); if (pl) { - if (x128_forceMagnitude > 0.f && True(x12c_flags & ETriggerFlags::DetectPlayer) && - mgr.GetLastTriggerId() == kInvalidUniqueId) { + if (x128_forceMagnitude > 0.f && True(x12c_flags & ETriggerFlags::DetectPlayer)) { + if (mgr.GetLastTriggerId() != kInvalidUniqueId) { + return; + } mgr.SetLastTriggerId(x8_uid); }