Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis

# Conflicts:
#	Content/Taktika/Maps/TKT_Landscape.umap

Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp

@@ -24,20 +24,20 @@ void AResComLevelPackLoader::Tick(float DeltaTime)
 {
 	Super::Tick(DeltaTime);
 	
-	if (packLoading->IsLoaded())
+	/*if (packLoading->IsLoaded())
 	{
 		Destroy();
-	}
+	}*/
 }
 
-void AResComLevelPackLoader::LoadPack(FFloorPack* pack)
-{
-	FLatentActionInfo latentInfo;
-	latentInfo.CallbackTarget = this;
-	latentInfo.UUID = 0;
-	latentInfo.Linkage = 0;
+//void AResComLevelPackLoader::LoadPack(FFloorPack* pack)
+//{
+//	FLatentActionInfo latentInfo;
+//	latentInfo.CallbackTarget = this;
+//	latentInfo.UUID = 0;
+//	latentInfo.Linkage = 0;
 
-	latentInfo.ExecutionFunction = "OnLevelPreview";
+	/*latentInfo.ExecutionFunction = "OnLevelPreview";
 	for (auto& level : pack.levelsPreview)
 	{
 		++queueElem.visibleCnt;
@@ -60,5 +60,5 @@ void AResComLevelPackLoader::LoadPack(FFloorPack* pack)
 		++latentInfo.UUID;
 		UGameplayStatics::LoadStreamLevel(this, *level, true, true, latentInfo);
 	}
-	return true;
-}
+	return true;*/
+//}

Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "ResComFloorManager.h"
+//#include "ResComFloorManager.h"
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
 #include "ResComLevelPackLoader.generated.h"
@@ -12,11 +12,11 @@ class FORTIS_TAKTIKA_API AResComLevelPackLoader : public AActor
 {
 	GENERATED_BODY()
 private:
-	FFloorPack* packLoading;
+	//FFloorPack* packLoading;
 public:	
 	// Sets default values for this actor's properties
 	AResComLevelPackLoader();
-	AResComLevelPackLoader(FFloorPack* pack) : packLoading(pack){}
+	//AResComLevelPackLoader(FFloorPack* pack) : packLoading(pack){}
 
 protected:
 	// Called when the game starts or when spawned
@@ -25,6 +25,6 @@ protected:
 public:	
 	// Called every frame
 	virtual void Tick(float DeltaTime) override;
-	void LoadPack(FFloorPack* pack);
+	//void LoadPack(FFloorPack* pack);
 
 };