Merge pull request 'martin' (#7) from martin into main

Reviewed-on: #7

Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp

@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LuckyrobotsGameInstance.h"
+#include "LuckyRobotsGameInstance.h"
 

Source/Luckyrobots/Private/LuckyRobotsGameMode.cpp

@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LuckyrobotsGameMode.h"
+#include "LuckyRobotsGameMode.h"
 

Source/Luckyrobots/Private/LuckyRobotsGameState.cpp

@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LuckyrobotsGameState.h"
+#include "LuckyRobotsGameState.h"
 

Source/Luckyrobots/Private/LuckyRobotsPlayerController.cpp

@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LuckyrobotsPlayerController.h"
+#include "LuckyRobotsPlayerController.h"
 

Source/Luckyrobots/Private/MainScreenUserWidget.cpp

@@ -3,7 +3,7 @@
 
 #include "MainScreenUserWidget.h"
 #include "Engine/DataTable.h"
-#include "LuckyrobotsGameInstance.h"
+#include "LuckyRobotsGameInstance.h"
 
 void UMainScreenUserWidget::NativeConstruct()
 {
@@ -17,13 +17,13 @@ void UMainScreenUserWidget::InitData()
 	InitRobotData();
 	InitLevelData();
 
-	ULuckyrobotsGameInstance* LuckyrobotsGameInstance = Cast<ULuckyrobotsGameInstance>(GetGameInstance());
+	ULuckyRobotsGameInstance* LuckyRobotsGameInstance = Cast<ULuckyRobotsGameInstance>(GetGameInstance());
-	if (LuckyrobotsGameInstance)
+	if (LuckyRobotsGameInstance)
 	{
 		UEnum* QualityEnum = StaticEnum<EQualityEnum>();
 		for (int32 i = 0; i < QualityEnum->NumEnums() - 1; i++)
 		{
-			if (EQualityEnum(QualityEnum->GetValueByIndex(i)) == LuckyrobotsGameInstance->CurrentSelectQuality)
+			if (EQualityEnum(QualityEnum->GetValueByIndex(i)) == LuckyRobotsGameInstance->CurrentSelectQuality)
 			{
 				iCurrentSelectRobot = i;
 				break;
@@ -174,31 +174,31 @@ void UMainScreenUserWidget::SelectPreviousQuality()
 
 void UMainScreenUserWidget::UpdateSelectRobot()
 {
-	ULuckyrobotsGameInstance* LuckyrobotsGameInstance = Cast<ULuckyrobotsGameInstance>(GetGameInstance());
+	ULuckyRobotsGameInstance* LuckyRobotsGameInstance = Cast<ULuckyRobotsGameInstance>(GetGameInstance());
-	if (LuckyrobotsGameInstance)
+	if (LuckyRobotsGameInstance)
 	{
-		LuckyrobotsGameInstance->CurrentSelectRobot = GetCurrentRobotData().Name;
+		LuckyRobotsGameInstance->CurrentSelectRobot = GetCurrentRobotData().Name;
 	}
 	BPUpdateSelectRobot();
 	InitLevelData();
 }
 void UMainScreenUserWidget::UpdateSelectLevel()
 {
-	ULuckyrobotsGameInstance* LuckyrobotsGameInstance = Cast<ULuckyrobotsGameInstance>(GetGameInstance());
+	ULuckyRobotsGameInstance* LuckyRobotsGameInstance = Cast<ULuckyRobotsGameInstance>(GetGameInstance());
-	if (LuckyrobotsGameInstance)
+	if (LuckyRobotsGameInstance)
 	{
-		LuckyrobotsGameInstance->CurrentSelectLevel = GetCurrentLevelData().LevelEnum;
+		LuckyRobotsGameInstance->CurrentSelectLevel = GetCurrentLevelData().LevelEnum;
 	}
 	BPUpdateSelectLevel();
 }
 
 void UMainScreenUserWidget::UpdateSelectQuality()
 {
-	ULuckyrobotsGameInstance* LuckyrobotsGameInstance = Cast<ULuckyrobotsGameInstance>(GetGameInstance());
+	ULuckyRobotsGameInstance* LuckyRobotsGameInstance = Cast<ULuckyRobotsGameInstance>(GetGameInstance());
-	if (LuckyrobotsGameInstance)
+	if (LuckyRobotsGameInstance)
 	{
 		UEnum* QualityEnum = StaticEnum<EQualityEnum>();
-		LuckyrobotsGameInstance->CurrentSelectQuality = EQualityEnum(QualityEnum->GetValueByIndex(iCurrentSelectQuality));
+		LuckyRobotsGameInstance->CurrentSelectQuality = EQualityEnum(QualityEnum->GetValueByIndex(iCurrentSelectQuality));
 	}
 	BPUpdateSelectQuality();
 }

Source/Luckyrobots/Public/LuckyRobotsGameInstance.h

@@ -5,13 +5,13 @@
 #include "CoreMinimal.h"
 #include "Engine/GameInstance.h"
 #include "SharedDef.h"
-#include "LuckyrobotsGameInstance.generated.h"
+#include "LuckyRobotsGameInstance.generated.h"
 
 /**
  * 
  */
 UCLASS()
-class LUCKYROBOTS_API ULuckyrobotsGameInstance : public UGameInstance
+class LUCKYROBOTS_API ULuckyRobotsGameInstance : public UGameInstance
 {
 	GENERATED_BODY()
 

Source/Luckyrobots/Public/LuckyRobotsGameMode.h

@@ -4,13 +4,13 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/GameModeBase.h"
-#include "LuckyrobotsGameMode.generated.h"
+#include "LuckyRobotsGameMode.generated.h"
 
 /**
  * 
  */
 UCLASS()
-class LUCKYROBOTS_API ALuckyrobotsGameMode : public AGameModeBase
+class LUCKYROBOTS_API ALuckyRobotsGameMode : public AGameModeBase
 {
 	GENERATED_BODY()
 	

Source/Luckyrobots/Public/LuckyRobotsGameState.h

@@ -4,13 +4,13 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/GameStateBase.h"
-#include "LuckyrobotsGameState.generated.h"
+#include "LuckyRobotsGameState.generated.h"
 
 /**
  * 
  */
 UCLASS()
-class LUCKYROBOTS_API ALuckyrobotsGameState : public AGameStateBase
+class LUCKYROBOTS_API ALuckyRobotsGameState : public AGameStateBase
 {
 	GENERATED_BODY()
 	

Source/Luckyrobots/Public/LuckyRobotsPlayerController.h

@@ -4,13 +4,13 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/PlayerController.h"
-#include "LuckyrobotsPlayerController.generated.h"
+#include "LuckyRobotsPlayerController.generated.h"
 
 /**
  * 
  */
 UCLASS()
-class LUCKYROBOTS_API ALuckyrobotsPlayerController : public APlayerController
+class LUCKYROBOTS_API ALuckyRobotsPlayerController : public APlayerController
 {
 	GENERATED_BODY()
 	

Source/Luckyrobots/Public/SharedDef.h

@@ -113,7 +113,7 @@ public:
 
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
-	FString LevelName;
+	TSoftObjectPtr<UWorld> LevelObject;
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	UTexture2D* LevelImage;