Fixed bugs related to cross level loading

Author: muit

Source/SaveExtension/Private/FileAdapter.cpp

@@ -314,7 +314,6 @@ void FFileAdapter::DeserializeObject(UObject*& Object, FStringView ClassName, co
 			Outer = GetTransientPackage();
 		}
 
-		check(IsInGameThread());
 		Object = NewObject<UObject>(const_cast<UObject*>(Outer), ObjectClass);
 	}
 	// Can only reuse object if class matches

Source/SaveExtension/Private/SaveManager.cpp

@@ -283,7 +283,10 @@ void USaveManager::TryInstantiateInfo(bool bForced)
 void USaveManager::UpdateLevelStreamings()
 {
 	UWorld* World = GetWorld();
-	check(World);
+	if(!World)
+	{
+		return;
+	}
 
 	const TArray<ULevelStreaming*>& Levels = World->GetStreamingLevels();
 

Source/SaveExtension/Private/Serialization/SlotDataTask_Loader.cpp

@@ -8,6 +8,7 @@
 #include <Components/PrimitiveComponent.h>
 #include <UObject/UObjectGlobals.h>
 
+#include "Misc/SlotHelpers.h"
 #include "SavePreset.h"
 #include "SaveManager.h"
 #include "Serialization/SEArchive.h"
@@ -62,7 +63,7 @@ void USlotDataTask_Loader::OnStart()
 
 	// Cross-Level loading
 	// TODO: Handle empty Map as empty world
-	FName CurrentMapName { World->GetMapName() };
+	FName CurrentMapName { FSlotHelpers::GetWorldName(World) };
 	if (CurrentMapName != NewSlotInfo->Map)
 	{
 		LoadState = ELoadDataTaskState::LoadingMap;
@@ -139,7 +140,12 @@ void USlotDataTask_Loader::OnMapLoaded()
 	}
 
 	const UWorld* World = GetWorld();
-	if (World->GetFName() == NewSlotInfo->Map)
+	if(!World)
+	{
+		UE_LOG(LogSaveExtension, Warning, TEXT("Failed loading map from saved slot."));
+		Finish(false);
+	}
+	else if (World->GetFName() == NewSlotInfo->Map)
 	{
 		if(IsDataLoaded())
 		{

Source/SaveExtension/Private/Serialization/SlotDataTask_Saver.cpp

@@ -5,6 +5,7 @@
 #include <GameFramework/GameModeBase.h>
 #include <Serialization/MemoryWriter.h>
 
+#include "Misc/SlotHelpers.h"
 #include "SaveManager.h"
 #include "SlotInfo.h"
 #include "SlotData.h"
@@ -92,8 +93,7 @@ void USlotDataTask_Saver::OnStart()
 		}
 
 		//Save Level info in both files
-		// TODO: Only if map is an asset, otherway it must be empty
-		SlotInfo->Map = FName{ World->GetMapName() };
+		SlotInfo->Map = FName{ FSlotHelpers::GetWorldName(World) };
 		SlotData->Map = SlotData->Map;
 
 		SerializeSync();

Source/SaveExtension/Public/Misc/SlotHelpers.h

@@ -2,13 +2,14 @@
 
 #pragma once
 
-#include "CoreMinimal.h"
+#include <CoreMinimal.h>
 #include <HAL/PlatformFile.h>
-#include "FileAdapter.h"
 
+#include "FileAdapter.h"
 
-struct FSlotHelpers {
 
+struct FSlotHelpers
+{
 	static void FindSlotFileNames(TArray<FString>& FoundSlots);
 
 	/** Used to find next available slot id */
@@ -23,4 +24,15 @@ struct FSlotHelpers {
 
 		virtual bool Visit(const TCHAR* FilenameOrDirectory, bool bIsDirectory) override;
 	};
+
+	static FString GetWorldName(const UWorld* World)
+	{
+		check(World);
+		const FString MapName = World->GetOutermost()->GetName();
+		if (World->IsPlayInEditor())
+		{
+			return UWorld::RemovePIEPrefix(MapName);
+		}
+		return MapName;
+	}
 };

Source/SaveExtension/Public/SaveManager.h

@@ -195,19 +195,19 @@ class SAVEEXTENSION_API USaveManager : public UGameInstanceSubsystem, public FTi
 
 	/** Load game from a slot name */
 	UFUNCTION(BlueprintCallable, Category = "SaveExtension|Loading",
-		meta = (DisplayName = "Load Slot from Id", Latent, LatentInfo = "LatentInfo",
+		meta = (DisplayName = "Load Slot", Latent, LatentInfo = "LatentInfo",
 			ExpandEnumAsExecs = "Result", UnsafeDuringActorConstruction))
 	void BPLoadSlot(FName SlotName, ELoadGameResult& Result, FLatentActionInfo LatentInfo);
 
 	/** Load game from a slot Id */
 	UFUNCTION(BlueprintCallable, Category = "SaveExtension|Loading",
-		meta = (DisplayName = "Load Slot from Id", Latent, LatentInfo = "LatentInfo",
+		meta = (DisplayName = "Load Slot by Id", Latent, LatentInfo = "LatentInfo",
 			ExpandEnumAsExecs = "Result", UnsafeDuringActorConstruction))
 	void BPLoadSlotById(int32 SlotId, ELoadGameResult& Result, FLatentActionInfo LatentInfo);
 
 	/** Load game from a SlotInfo */
 	UFUNCTION(BlueprintCallable, Category = "SaveExtension|Loading",
-		meta = (DisplayName = "Load Slot", Latent, LatentInfo = "LatentInfo", ExpandEnumAsExecs = "Result",
+		meta = (DisplayName = "Load Slot by Info", Latent, LatentInfo = "LatentInfo", ExpandEnumAsExecs = "Result",
 			UnsafeDuringActorConstruction))
 	void BPLoadSlotByInfo(const USlotInfo* SlotInfo, ELoadGameResult& Result, FLatentActionInfo LatentInfo);
 
@@ -443,6 +443,25 @@ class SAVEEXTENSION_API USaveManager : public UGameInstanceSubsystem, public FTi
 public:
 	/** Get the global save manager */
 	static USaveManager* Get(const UObject* ContextObject);
+
+
+	/***********************************************************************/
+	/* DEPRECATED                                                          */
+	/***********************************************************************/
+
+	UFUNCTION(Category = "SaveExtension|Saving", BlueprintCallable, meta = (DeprecatedFunction, DeprecationMessage="Use 'Save Slot by Id' instead.", 
+		AdvancedDisplay = "bScreenshot, Size", DisplayName = "Save Slot to Id", Latent, LatentInfo = "LatentInfo", ExpandEnumAsExecs = "Result", UnsafeDuringActorConstruction))
+	void BPSaveSlotToId(int32 SlotId, bool bScreenshot, const FScreenshotSize Size, ESaveGameResult& Result, FLatentActionInfo LatentInfo, bool bOverrideIfNeeded = true)
+	{
+		BPSaveSlotById(SlotId, bScreenshot, Size, Result, LatentInfo, bOverrideIfNeeded);
+	}
+
+	UFUNCTION(BlueprintCallable, Category = "SaveExtension|Loading", meta = (DeprecatedFunction, DeprecationMessage="Use 'Load Slot by Id' instead.",
+		DisplayName = "Load Slot from Id", Latent, LatentInfo = "LatentInfo", ExpandEnumAsExecs = "Result", UnsafeDuringActorConstruction))
+	void BPLoadSlotFromId(int32 SlotId, ELoadGameResult& Result, FLatentActionInfo LatentInfo)
+	{
+		BPLoadSlotById(SlotId, Result, LatentInfo);
+	}
 };
 
 

Source/SaveExtension/Public/SavePreset.h

@@ -155,7 +155,7 @@ class SAVEEXTENSION_API USavePreset : public UObject
 
 	USavePreset();
 
-	UFUNCTION(BlueprintNativeEvent, Category = "Slots", meta = (DisplayName="Generate Slot Name"))
+	UFUNCTION(BlueprintNativeEvent, Category = "Slots", meta = (DisplayName="Get Slot Name from Id"))
 	void BPGetSlotNameFromId(int32 Id, FName& Name) const;
 
 protected: