[UE5.4] Updated to newest engine version

JanSeliv · Apr 1, 2024 · 781dcbe · 781dcbe
1 parent 2097963
commit 781dcbe
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 16 deletions.
diff --git a/PoolManager.uplugin b/PoolManager.uplugin
@@ -10,7 +10,7 @@
 	"DocsURL": "",
 	"MarketplaceURL": "",
 	"SupportURL": "mailto:[email protected]",
-	"EngineVersion": "5.3.0",
+	"EngineVersion": "5.4.0",
 	"EnabledByDefault": true,
 	"CanContainContent": false,
 	"IsBetaVersion": false,

diff --git a/README.md b/README.md
@@ -19,6 +19,8 @@ Check out our [Release](https://github.com/JanSeliv/PoolManager/releases) page f
 Also, explore this [game project repository](https://github.com/JanSeliv/Bomber) to view the Pool Manager in action.
 
 ## 📅 Changelog
+#### 
+- Updated to **Unreal Engine 5.4**.
 #### 2023-11-25
 - Updated to **Unreal Engine 5.3**.
 - Introduced **Factories** to handle differences in pools by object archetypes (e.g.: uobjects, actors, components, widgets etc.).

diff --git a/Source/PoolManager/Private/Factories/PoolFactory_UObject.cpp b/Source/PoolManager/Private/Factories/PoolFactory_UObject.cpp
@@ -3,6 +3,7 @@
 #include "Factories/PoolFactory_UObject.h"
 //---
 #include "Data/PoolManagerSettings.h"
+#include "Engine/World.h"
 //---
 #include UE_INLINE_GENERATED_CPP_BY_NAME(PoolFactory_UObject)
 

diff --git a/Source/PoolManager/Private/PoolManagerModule.cpp b/Source/PoolManager/Private/PoolManagerModule.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Yevhenii Selivanov.
 
 #include "PoolManagerModule.h"
-
-#define LOCTEXT_NAMESPACE "FPoolManagerModule"
+//---
+#include "Modules/ModuleManager.h"
 
 void FPoolManagerModule::StartupModule()
 {
@@ -15,6 +15,4 @@ void FPoolManagerModule::ShutdownModule()
 	// we call this function before unloading the module.
 }
 
-#undef LOCTEXT_NAMESPACE
-
 IMPLEMENT_MODULE(FPoolManagerModule, PoolManager)
diff --git a/Source/PoolManager/Private/PoolManagerSubsystem.cpp b/Source/PoolManager/Private/PoolManagerSubsystem.cpp
@@ -65,9 +65,9 @@ void UPoolManagerSubsystem::BPTakeFromPool(const UClass* ObjectClass, const FTra
 	FSpawnRequest Request;
 	Request.Class = ObjectClass;
 	Request.Transform = Transform;
-	Request.Callbacks.OnPostSpawned = [Completed](const FPoolObjectData& ObjectData)
+	Request.Callbacks.OnPostSpawned = [Completed](const FPoolObjectData& It)
 	{
-		Completed.ExecuteIfBound(ObjectData.PoolObject);
+		Completed.ExecuteIfBound(It.PoolObject);
 	};
 	CreateNewObjectInPool(Request);
 }

diff --git a/Source/PoolManagerEditor/Private/K2Node_TakeFromPool.cpp b/Source/PoolManagerEditor/Private/K2Node_TakeFromPool.cpp
@@ -183,7 +183,7 @@ void UK2Node_TakeFromPool::ExpandNode(class FKismetCompilerContext& CompilerCont
 
 	// Create Completed delegate parameter
 	const FName DelegateCompletedParamName(TEXT("Completed"));
-	UK2Node_CustomEvent* CompletedEventNode = CompilerContext.SpawnIntermediateEventNode<UK2Node_CustomEvent>(this, CallClassPin, SourceGraph);
+	UK2Node_CustomEvent* CompletedEventNode = CompilerContext.SpawnIntermediateNode<UK2Node_CustomEvent>(this, SourceGraph);
 	CompletedEventNode->CustomFunctionName = *FString::Printf(TEXT("Completed_%s"), *CompilerContext.GetGuid(this));
 	CompletedEventNode->AllocateDefaultPins();
 	{
@@ -263,7 +263,7 @@ bool UK2Node_TakeFromPool::IsCompatibleWithGraph(const UEdGraph* TargetGraph) co
 	bool bIsCompatible = false;
 	// Can only place events in ubergraphs and macros (other code will help prevent macros with latents from ending up in functions), and basicasync task creates an event node:
 	const EGraphType GraphType = TargetGraph->GetSchema()->GetGraphType(TargetGraph);
-	if (GraphType == EGraphType::GT_Ubergraph || GraphType == EGraphType::GT_Macro)
+	if (GraphType == GT_Ubergraph || GraphType == GT_Macro)
 	{
 		bIsCompatible = true;
 	}

diff --git a/Source/PoolManagerEditor/Private/PoolManagerEditorModule.cpp b/Source/PoolManagerEditor/Private/PoolManagerEditorModule.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Yevhenii Selivanov.
 
 #include "PoolManagerEditorModule.h"
-
-#define LOCTEXT_NAMESPACE "FPoolManagerEditorModule"
+//---
+#include "Modules/ModuleManager.h"
 
 void FPoolManagerEditorModule::StartupModule()
 {
@@ -15,6 +15,4 @@ void FPoolManagerEditorModule::ShutdownModule()
 	// we call this function before unloading the module.
 }
 
-#undef LOCTEXT_NAMESPACE
-
-IMPLEMENT_MODULE(FPoolManagerEditorModule, PoolManagerEditor)
+IMPLEMENT_MODULE(FPoolManagerEditorModule, PoolManagerEditor)
diff --git a/Source/PoolManagerEditor/Public/PoolManagerEditorModule.h b/Source/PoolManagerEditor/Public/PoolManagerEditorModule.h
@@ -3,8 +3,6 @@
 #pragma once
 
 #include "Modules/ModuleInterface.h"
-//---
-#include "Modules/ModuleManager.h"
 
 class POOLMANAGEREDITOR_API FPoolManagerEditorModule : public IModuleInterface
 {