From 1492515932701c7b17e2fc6b8caf9901976e22f8 Mon Sep 17 00:00:00 2001 From: Ange-Marie MAURIN Date: Fri, 11 Jul 2025 01:03:42 +0200 Subject: [PATCH] Last Fix For Pursuit for tonight --- .../DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp | 3 +-- .../DTFluxCoreSubsystem/Private/DTFluxPursuitManager.cpp | 2 +- Source/DTFluxCoreSubsystem/Public/DTFluxCoreSubsystem.h | 9 ++++++++- Source/DTFluxCoreSubsystem/Public/DTFluxPursuitManager.h | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Source/DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp b/Source/DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp index 9c30bd6..0b4f779 100644 --- a/Source/DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp +++ b/Source/DTFluxCoreSubsystem/Private/DTFluxCoreSubsystem.cpp @@ -367,11 +367,10 @@ void UDTFluxCoreSubsystem::LaunchPursuitSequenceFor(const TArray ContestIds } } -FOnPursuitSequenceReady& UDTFluxCoreSubsystem::InitPursuit(const TArray Contests) +void UDTFluxCoreSubsystem::InitPursuit(const TArray Contests) { if (PursuitManager) { PursuitManager->LaunchPursuitSequenceFor(Contests); } - return PursuitManager->OnPursuitSequenceReady; } diff --git a/Source/DTFluxCoreSubsystem/Private/DTFluxPursuitManager.cpp b/Source/DTFluxCoreSubsystem/Private/DTFluxPursuitManager.cpp index aa5ff27..f020353 100644 --- a/Source/DTFluxCoreSubsystem/Private/DTFluxPursuitManager.cpp +++ b/Source/DTFluxCoreSubsystem/Private/DTFluxPursuitManager.cpp @@ -66,7 +66,7 @@ void UDTFluxPursuitManager::OnRequestResponse(const FGuid& RequestId, FDTFluxSer } if (InitPursuit(FoundData)) { - OnPursuitSequenceReady.Broadcast(NextFocusPursuits, NextFocusPursuits, bFocusIsTruncate); + OnPursuitSequenceReady_Internal.Broadcast(NextFocusPursuits, NextFocusPursuits, bFocusIsTruncate); } } } diff --git a/Source/DTFluxCoreSubsystem/Public/DTFluxCoreSubsystem.h b/Source/DTFluxCoreSubsystem/Public/DTFluxCoreSubsystem.h index 8109d62..fc12d59 100644 --- a/Source/DTFluxCoreSubsystem/Public/DTFluxCoreSubsystem.h +++ b/Source/DTFluxCoreSubsystem/Public/DTFluxCoreSubsystem.h @@ -1,6 +1,7 @@ #pragma once #include "CoreMinimal.h" +#include "DTFluxPursuitManager.h" #include "Containers/Deque.h" #include "Subsystems/EngineSubsystem.h" #include "Types/Struct/DTFluxRaceDataStructs.h" @@ -110,9 +111,15 @@ public: UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem") void LaunchPursuitSequenceFor(const TArray ContestIds); + DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnPursuitSequenceReady, const TArray, + NextFocusPursuits, + const TArray, NextPursuit, bool, bIsTrtuncate); + + UPROPERTY(BlueprintAssignable, Category="DTFlux|Pursuit") + FOnPursuitSequenceReady OnPursuitSequenceReady; UFUNCTION(BlueprintCallable, Category="DTFlux|Core Subsystem") - FOnPursuitSequenceReady& InitPursuit(const TArray Contests); + void InitPursuit(const TArray Contests); protected: // ~Subsystem Interface diff --git a/Source/DTFluxCoreSubsystem/Public/DTFluxPursuitManager.h b/Source/DTFluxCoreSubsystem/Public/DTFluxPursuitManager.h index 5540c8b..cfd5838 100644 --- a/Source/DTFluxCoreSubsystem/Public/DTFluxPursuitManager.h +++ b/Source/DTFluxCoreSubsystem/Public/DTFluxPursuitManager.h @@ -63,7 +63,7 @@ struct FDTFluxPursuitGroup bool bIsFocus = false; }; -DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnPursuitSequenceReady, const TArray, +DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnPursuitSequenceReady_internal, const TArray, NextFocusPursuits, const TArray, NextPursuit, bool, bIsTrtuncate); @@ -103,7 +103,7 @@ public: int CurrentIndex = -1; UPROPERTY(BlueprintAssignable, Category="DTFlux|Pursuit") - FOnPursuitSequenceReady OnPursuitSequenceReady; + FOnPursuitSequenceReady_internal OnPursuitSequenceReady_Internal; UFUNCTION(BlueprintCallable, Category="DTFlux|Pursuit", meta=(Keywords="pursuit, launch, poursuite"))