From 68a7b34304ef157c63ab6fcb171f3b36a94ce714 Mon Sep 17 00:00:00 2001 From: Ange-Marie MAURIN Date: Thu, 18 Jul 2024 16:06:24 +0200 Subject: [PATCH] Event OnCutoff + OnStageStarted + OnStaageLoading modified to send contests Array --- .../DTFluxSubsystem/DTFluxSubsystemTimer.cpp | 21 ++++++++++++------- .../DTFluxSubsystem/DTFluxSubsystemTimer.h | 12 +++++------ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Source/DTFluxAPI/Private/DTFluxSubsystem/DTFluxSubsystemTimer.cpp b/Source/DTFluxAPI/Private/DTFluxSubsystem/DTFluxSubsystemTimer.cpp index 5521101..774d2c2 100644 --- a/Source/DTFluxAPI/Private/DTFluxSubsystem/DTFluxSubsystemTimer.cpp +++ b/Source/DTFluxAPI/Private/DTFluxSubsystem/DTFluxSubsystemTimer.cpp @@ -110,7 +110,9 @@ void UDTFluxSubsystemTimer::OnStartTimer() { if(World->GetTimerManager().GetTimerRemaining(Timer.Handle) == 0) { - OnStageStarted.Broadcast(Timer.ContestId, Timer.StageId); + TArray ContestIds; + ContestIds.Add(Timer.ContestId); + OnStageStarted.Broadcast(ContestIds, Timer.StageId); break; } } @@ -134,7 +136,9 @@ void UDTFluxSubsystemTimer::OnCutOffTimer() { if(World->GetTimerManager().GetTimerRemaining(Timer.Handle) == 0) { - OnCutoff.Broadcast(Timer.ContestId, Timer.StageId); + TArray ContestIds; + ContestIds.Add(Timer.ContestId); + OnCutoff.Broadcast(ContestIds, Timer.StageId); break; } } @@ -164,19 +168,20 @@ void UDTFluxSubsystemTimer::ClearTimer(const int HandleIndex) { } -void UDTFluxSubsystemTimer::TriggerOnCutOff(const int ContestId, const int StageId) + +void UDTFluxSubsystemTimer::TriggerOnCutOff(const TArray ContestIds, const int StageId) { - OnCutoff.Broadcast(ContestId, StageId); + OnCutoff.Broadcast(ContestIds, StageId); } -void UDTFluxSubsystemTimer::TriggerStartTime(const int ContestId, const int StageId) +void UDTFluxSubsystemTimer::TriggerStartTime(const TArray ContestIds, const int StageId) { - OnStageStarted.Broadcast(ContestId, StageId); + OnStageStarted.Broadcast(ContestIds, StageId); } -void UDTFluxSubsystemTimer::TriggerStageLoading(const int ContestId, const int StageId, int DelayBeforeStageStart) +void UDTFluxSubsystemTimer::TriggerStageLoading(const TArray ContestIds, const int StageId, int DelayBeforeStageStart) { - OnStageLoading.Broadcast(ContestId, StageId, DelayBeforeStageStart); + OnStageLoading.Broadcast(ContestIds, StageId, DelayBeforeStageStart); } UDTFluxSubsystem* UDTFluxSubsystemTimer::GetDTFluxSubSystem() diff --git a/Source/DTFluxAPI/Public/DTFluxSubsystem/DTFluxSubsystemTimer.h b/Source/DTFluxAPI/Public/DTFluxSubsystem/DTFluxSubsystemTimer.h index dc41d7d..68ad543 100644 --- a/Source/DTFluxAPI/Public/DTFluxSubsystem/DTFluxSubsystemTimer.h +++ b/Source/DTFluxAPI/Public/DTFluxSubsystem/DTFluxSubsystemTimer.h @@ -31,9 +31,9 @@ public: FTimerHandle Handle; }; -DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnCutoff, int, ContestId, int, StageId); -DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnStageStarted, int, ContestId, int, StageId); -DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnStageLoading, int, ContestId, int, StageId, int, DelayBeforeStageStart); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnCutoff, TArray, ContestIds, int, StageId); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnStageStarted, TArray, ContestIds, int, StageId); +DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnStageLoading, TArray, ContestIds, int, StageId, int, DelayBeforeStageStart); UCLASS(BlueprintType, Category="DTFlux|Timer") @@ -79,13 +79,13 @@ public: void ClearTimer(const int HandleIndex); UFUNCTION(BlueprintCallable, Category="DTFlux|Timer") - void TriggerOnCutOff(const int ContestId, const int StageId); + void TriggerOnCutOff(const TArray ContestIds, const int StageId); UFUNCTION(BlueprintCallable, Category="DTFlux|Timer") - void TriggerStartTime(const int ContestId, const int StageId); + void TriggerStartTime(const TArray ContestIds, const int StageId); UFUNCTION(BlueprintCallable, Category="DTFlux|Timer") - void TriggerStageLoading(const int ContestId, const int StageId, int DelayBeforeStageStart); + void TriggerStageLoading(const TArray ContestIds, const int StageId, int DelayBeforeStageStart); static UDTFluxSubsystem* GetDTFluxSubSystem(); static UDTFluxDataStorage* GetDTFluxDataStorage();