Use project GameInstance class by default

slonopotamus · Aug 5, 2024 · 401cd76 · 401cd76
1 parent c09301c
commit 401cd76
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Source/UEST/Private/ScopedGame.cpp b/Source/UEST/Private/ScopedGame.cpp
@@ -398,9 +398,13 @@ bool FScopedGameInstance::TickUntil(const TFunction<bool()>& Condition, const fl
 	return Condition();
 }
 
-FScopedGame& FScopedGame::WithProjectGameInstance()
+FScopedGame::FScopedGame()
 {
-	return WithGameInstance(GetDefault<UGameMapsSettings>()->GameInstanceClass.TryLoadClass<UGameInstance>());
+	GameInstanceClass = GetDefault<UGameMapsSettings>()->GameInstanceClass.TryLoadClass<UGameInstance>();
+	if (!GameInstanceClass)
+	{
+		GameInstanceClass = UGameInstance::StaticClass();
+	}
 }
 
 FScopedGameInstance FScopedGame::Create() const

diff --git a/Source/UEST/Public/ScopedGame.h b/Source/UEST/Public/ScopedGame.h
@@ -57,10 +57,12 @@ class FScopedGameInstance : FNoncopyable
 
 class FScopedGame
 {
-	TSubclassOf<UGameInstance> GameInstanceClass = UGameInstance::StaticClass();
+	TSubclassOf<UGameInstance> GameInstanceClass;
 	bool bGarbageCollectOnDestroy = true;
 
 public:
+	FScopedGame();
+
 	FScopedGame& WithGameInstance(TSubclassOf<UGameInstance> InGameInstanceClass)
 	{
 		GameInstanceClass = MoveTemp(InGameInstanceClass);
@@ -73,7 +75,5 @@ class FScopedGame
 		return *this;
 	}
 
-	FScopedGame& WithProjectGameInstance();
-
 	FScopedGameInstance Create() const;
 };