Tidying up warnings and deprecations for 5.2 upgrade.

midgen · May 27, 2023 · 9f1ec6b · 9f1ec6b
1 parent 002db5d
commit 9f1ec6b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/Source/UESVON/Private/AITask_SVONMoveTo.cpp b/Source/UESVON/Private/AITask_SVONMoveTo.cpp
@@ -573,7 +573,7 @@ void UAITask_SVONMoveTo::OnRequestFinished(FAIRequestID RequestID, const FPathFo
 
 void UAITask_SVONMoveTo::OnPathEvent(FNavigationPath* InPath, ENavPathEvent::Type Event)
 {
-	const static UEnum* NavPathEventEnum = FindObject<UEnum>(ANY_PACKAGE, TEXT("ENavPathEvent"));
+	const static UEnum* NavPathEventEnum = FindObject<UEnum>(this, TEXT("ENavPathEvent"));
 	UE_VLOG(GetGameplayTasksComponent(), LogGameplayTasks, Log, TEXT("%s> Path event: %s"), *GetName(), *NavPathEventEnum->GetNameStringByValue(Event));
 
 	switch (Event)

diff --git a/Source/UESVON/Private/BTTask_SVONMoveTo.cpp b/Source/UESVON/Private/BTTask_SVONMoveTo.cpp
@@ -16,7 +16,7 @@ UBTTask_SVONMoveTo::UBTTask_SVONMoveTo(const FObjectInitializer& ObjectInitializ
 	: Super(ObjectInitializer)
 {
 	NodeName = "SVON Move To";
-	bNotifyTick = ~bUseGameplayTasks;
+	bNotifyTick = false;
 	bNotifyTaskFinished = true;
 
 	AcceptableRadius = GET_AI_CONFIG_VAR(AcceptanceRadius);
@@ -39,7 +39,7 @@ EBTNodeResult::Type UBTTask_SVONMoveTo::ExecuteTask(UBehaviorTreeComponent& Owne
 	MyMemory->MoveRequestID = FAIRequestID::InvalidRequest;
 
 	AAIController* MyController = OwnerComp.GetAIOwner();
-	MyMemory->bWaitingForPath = bUseGameplayTasks ? false : MyController->ShouldPostponePathUpdates();
+	MyMemory->bWaitingForPath = false;
 	if (!MyMemory->bWaitingForPath)
 	{
 		NodeResult = PerformMoveTask(OwnerComp, NodeMemory);
@@ -222,18 +222,10 @@ EBlackboardNotificationResult UBTTask_SVONMoveTo::OnBlackboardValueChange(const
 				BehaviorComp->GetAIOwner()->GetPathFollowingComponent()->AbortMove(*this, FPathFollowingResultFlags::NewRequest, MyMemory->MoveRequestID, EPathFollowingVelocityMode::Keep);
 			}
 
-			if (!bUseGameplayTasks && BehaviorComp->GetAIOwner()->ShouldPostponePathUpdates())
-			{
-				// NodeTick will take care of requesting move
-				MyMemory->bWaitingForPath = true;
-			}
-			else
+			const EBTNodeResult::Type NodeResult = PerformMoveTask(*BehaviorComp, RawMemory);
+			if (NodeResult != EBTNodeResult::InProgress)
 			{
-				const EBTNodeResult::Type NodeResult = PerformMoveTask(*BehaviorComp, RawMemory);
-				if (NodeResult != EBTNodeResult::InProgress)
-				{
-					FinishLatentTask(*BehaviorComp, NodeResult);
-				}
+				FinishLatentTask(*BehaviorComp, NodeResult);
 			}
 		}
 	}

diff --git a/Source/UESVON/Public/BTTask_SVONMoveTo.h b/Source/UESVON/Public/BTTask_SVONMoveTo.h
@@ -64,9 +64,6 @@ class UESVON_API UBTTask_SVONMoveTo : public UBTTask_BlackboardBase
 	UPROPERTY(Category = Node, EditAnywhere)
 		bool bUseAsyncPathfinding;
 
-	/** set automatically if move should use GameplayTasks */
-	uint32 bUseGameplayTasks : 1;
-
 	virtual EBTNodeResult::Type ExecuteTask(UBehaviorTreeComponent& OwnerComp, uint8* NodeMemory) override;
 	virtual EBTNodeResult::Type AbortTask(UBehaviorTreeComponent& OwnerComp, uint8* NodeMemory) override;
 	virtual void OnTaskFinished(UBehaviorTreeComponent& OwnerComp, uint8* NodeMemory, EBTNodeResult::Type TaskResult) override;