bug fix

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/CustomGameInstance.cpp

@@ -130,21 +130,19 @@ void UCustomGameInstance::SaveGame(FName checkpointName)
     if(!levelScript)
         return;
 
-    auto player = APlayerBase::Get();
-    if(!player)
-        return;
-
     saveData->level = GetWorld()->GetFName();
     saveData->state = levelScript->GetState();
     saveData->checkpoint = checkpointName;
-    if(player->leftPocketItem)
+
+    auto player = APlayerBase::Get();
+    if(player && player->leftPocketItem)
         saveData->playerLeftPocketItem = player->leftPocketItem->GetFName();
     else
-        saveData->playerLeftPocketItem = FName(TEXT(""));
-    if(player->rightPocketItem)
+        saveData->playerLeftPocketItem = {};
+    if(player && player->rightPocketItem)
         saveData->playerRightPocketItem = player->rightPocketItem->GetFName();
     else
-        saveData->playerRightPocketItem = FName(TEXT(""));
+        saveData->playerRightPocketItem = {};
 
     UGameplayStatics::SaveGameToSlot(saveData, saveName, saveIndex);
 }

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level1.cpp

@@ -10,6 +10,7 @@
 #include "Engine/SkyLight.h"
 #include "LevelSequencePlayer.h"
 
+#include "CustomGameInstance.h"
 #include "CutsceneManager.h"
 
 void ALevel1::BeginPlay()
@@ -19,6 +20,9 @@ void ALevel1::BeginPlay()
     //TurnLight(false);
     //TurnFog(false);
 
+    if(auto GI = UCustomGameInstance::Get())
+        GI->SaveGame({});
+
     CallNextState();
 }
 

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level2.cpp

@@ -2,9 +2,14 @@
 
 #include "Level2.h"
 
+#include "CustomGameInstance.h"
+
 void ALevel2::BeginPlay()
 {
     ALevelBase::BeginPlay();
 
+    if(auto GI = UCustomGameInstance::Get())
+        GI->SaveGame({});
+
     CallNextState();
 }

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/Level3.cpp

@@ -8,6 +8,7 @@
 #include "Engine/SkyLight.h"
 #include "LevelSequencePlayer.h"
 
+#include "CustomGameInstance.h"
 #include "CutsceneManager.h"
 #include "MainGameModeBase.h"
 
@@ -15,5 +16,8 @@ void ALevel3::BeginPlay()
 {
     ALevelBase::BeginPlay();
 
-    CallNextState();
+    if(auto GI = UCustomGameInstance::Get())
+        GI->SaveGame({});
+
+    //CallNextState();
 }

UnrealProject/Lost_Edge/Source/Lost_Edge/Private/Levels/LevelBase.cpp

@@ -89,32 +89,37 @@ void ALevelBase::ApplySaveData()
     if(!player)
         return;
 
-    for(TActorIterator<ACheckpoint> it(GetWorld()); it; ++it)
+    if(!GI->saveData->checkpoint.IsNone())
     {
-        if(it->GetFName() == GI->saveData->checkpoint)
+        for(TActorIterator<ACheckpoint> it(GetWorld()); it; ++it)
         {
-            player->SetActorLocation(it->GetActorLocation(), false, nullptr, ETeleportType::ResetPhysics);
-            player->Controller->SetControlRotation(it->GetActorRotation());
-            break;
+            if(it->GetFName() == GI->saveData->checkpoint)
+            {
+                player->SetActorLocation(it->GetActorLocation(), false, nullptr, ETeleportType::ResetPhysics);
+                player->Controller->SetControlRotation(it->GetActorRotation());
+                break;
+            }
         }
     }
 
-    int pocketItems = 0;
-    for(TActorIterator<AInteractable> it(GetWorld()); it; ++it)
+    if(!GI->saveData->playerLeftPocketItem.IsNone() || !GI->saveData->playerRightPocketItem.IsNone())
     {
-        if(it->GetFName() == GI->saveData->playerLeftPocketItem)
+        int pocketItems = 0;
+        for(TActorIterator<AInteractable> it(GetWorld()); it; ++it)
         {
-            ++pocketItems;
-            player->TakeItemToLeftHand(*it);
-        }
-        else if(it->GetFName() == GI->saveData->playerRightPocketItem)
-        {
-            ++pocketItems;
-            player->TakeItemToRightHand(*it);
-        }
-        if(pocketItems > 1)
-        {
-            break;
+            if(pocketItems > 1)
+                break;
+
+            if(it->GetFName() == GI->saveData->playerLeftPocketItem)
+            {
+                ++pocketItems;
+                player->TakeItemToLeftHand(*it);
+            }
+            else if(it->GetFName() == GI->saveData->playerRightPocketItem)
+            {
+                ++pocketItems;
+                player->TakeItemToRightHand(*it);
+            }
         }
     }
 }