diff --git a/Source/Nakatomi/LevelEndTriggerVolume.cpp b/Source/Nakatomi/LevelEndTriggerVolume.cpp index 9fb2f1f..a4cfaca 100644 --- a/Source/Nakatomi/LevelEndTriggerVolume.cpp +++ b/Source/Nakatomi/LevelEndTriggerVolume.cpp @@ -35,7 +35,7 @@ void ALevelEndTriggerVolume::OnOverlapBegin(UPrimitiveComponent* OverlappedCompo { GetCollisionComponent()->OnComponentBeginOverlap.Clear(); - gameInstance->GetCurrentLevelManager()->LoadNextLevel(); + gameInstance->GetCurrentLevelManager()->LoadNextLevel(NextLevel); this->Destroy(); } diff --git a/Source/Nakatomi/LevelEndTriggerVolume.h b/Source/Nakatomi/LevelEndTriggerVolume.h index 2c44cba..164096a 100644 --- a/Source/Nakatomi/LevelEndTriggerVolume.h +++ b/Source/Nakatomi/LevelEndTriggerVolume.h @@ -14,6 +14,11 @@ class NAKATOMI_API ALevelEndTriggerVolume : public ATriggerBox { GENERATED_BODY() +private: + + UPROPERTY(EditDefaultsOnly, Meta = (AllowPrivateAccess = "true")) + TSoftObjectPtr NextLevel; + protected: virtual void BeginPlay() override; diff --git a/Source/Nakatomi/NakatomiLevelManager.cpp b/Source/Nakatomi/NakatomiLevelManager.cpp index 6f8a7e8..431b65c 100644 --- a/Source/Nakatomi/NakatomiLevelManager.cpp +++ b/Source/Nakatomi/NakatomiLevelManager.cpp @@ -19,7 +19,7 @@ void UNakatomiLevelManager::BeginPlay(UWorld* world) } } -void UNakatomiLevelManager::LoadNextLevel() +void UNakatomiLevelManager::LoadNextLevel(TSoftObjectPtr NextLevel) { if (!NextLevel.IsNull()) { diff --git a/Source/Nakatomi/NakatomiLevelManager.h b/Source/Nakatomi/NakatomiLevelManager.h index db14fde..8fa43f6 100644 --- a/Source/Nakatomi/NakatomiLevelManager.h +++ b/Source/Nakatomi/NakatomiLevelManager.h @@ -16,8 +16,6 @@ class NAKATOMI_API UNakatomiLevelManager : public UObject UNakatomiLevelManager(); private: - UPROPERTY(EditDefaultsOnly, Meta = (AllowPrivateAccess = "true")) - TSoftObjectPtr NextLevel; int InitialLevelKeys = 0; @@ -25,7 +23,7 @@ private: public: UFUNCTION() - void LoadNextLevel(); + void LoadNextLevel(TSoftObjectPtr NextLevel); UFUNCTION() void IncrementInitialLevelKeys();