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

Source/FORTIS_Taktika/Private/ResComPlayerController.cpp

@@ -23,28 +23,34 @@ AResComFloorManager* AResComPlayerController::GetFloorManager() const
 	return floorManager;
 }
 
-void AResComPoint::BeginPlay()
+//void AResComPoint::BeginPlay()
+//{
+//	Super::BeginPlay();
+//
+//	// spectrator window
+//	/*SlateWin = SNew(SWindow)
+//		.AutoCenter(EAutoCenter::None)
+//		.Title(FText::FromString(TEXT("Control Window")))
+//		.IsInitiallyMaximized(false)
+//		.ScreenPosition(FVector2D(0, 0))
+//		.ClientSize(FVector2D(500, 800))
+//		.CreateTitleBar(true)
+//		.SizingRule(ESizingRule::UserSized)
+//		.SupportsMaximize(false)
+//		.SupportsMinimize(true)
+//		.HasCloseButton(true);
+//
+//	TSharedRef<SWindow> SlateWinRef = SlateWin.ToSharedRef();
+//
+//	FSlateApplication& SlateApp = FSlateApplication::Get();
+//
+//	SlateApp.AddWindow(SlateWinRef, true);
+//
+//	SlateWinRef->SetContent(SNew(SControlWidget));*/
+//}
+
+void AResComPlayerController::freeMemory()
 {
-	Super::BeginPlay();
-
-	// spectrator window
-	/*SlateWin = SNew(SWindow)
-		.AutoCenter(EAutoCenter::None)
-		.Title(FText::FromString(TEXT("Control Window")))
-		.IsInitiallyMaximized(false)
-		.ScreenPosition(FVector2D(0, 0))
-		.ClientSize(FVector2D(500, 800))
-		.CreateTitleBar(true)
-		.SizingRule(ESizingRule::UserSized)
-		.SupportsMaximize(false)
-		.SupportsMinimize(true)
-		.HasCloseButton(true);
-
-	TSharedRef<SWindow> SlateWinRef = SlateWin.ToSharedRef();
-
-	FSlateApplication& SlateApp = FSlateApplication::Get();
-
-	SlateApp.AddWindow(SlateWinRef, true);
-
-	SlateWinRef->SetContent(SNew(SControlWidget));*/
+	GEngine->ForceGarbageCollection();
+	//GetWorld()->ForceGarbageCollection(true);
 }

Source/FORTIS_Taktika/Public/ResComPlayerController.h

@@ -25,11 +25,14 @@ protected:
 	UFUNCTION(BlueprintCallable, Category = "FloorManager")
 	void SetFloorManager(AResComFloorManager* manager);
 
-	virtual void BeginPlay() override;
+	//virtual void BeginPlay() override;
 public:
 	UFUNCTION(BlueprintCallable, Category = "PlayerManager")
 	AResComPlayerStateManager* GetPlayerStateManager() const;
 
 	UFUNCTION(BlueprintCallable, Category = "FloorManager")
 	AResComFloorManager* GetFloorManager() const;
+
+	UFUNCTION(BlueprintCallable, Category = "GarbageCollection")
+	void freeMemory();
 };