Quality of Life Changes

EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp

@@ -122,6 +122,8 @@ void ABountyHunterCharacter::BeginPlay()
 		SpawnMainBounty(GI);
 		if (UGameplayStatics::GetCurrentLevelName(GetWorld()) == OpenWorldLevelName)
 		{
+			InOpenWorld = true;
+			SpawnBikeUI();
 			SpawnSideBounties(GI);
 			FTransform SpawnTransfrom = GI->MainSaveGameInstanceRef->PlayerOpenWorldSpawnTransformSave;
 			SetActorTransform(SpawnTransfrom);

EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h

@@ -92,7 +92,9 @@ protected:
 	
 	// Called When Actor destroyed or Removed from Level
 	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
-	
+
+	UFUNCTION(BlueprintImplementableEvent)
+	void SpawnBikeUI();
 public:
 	// Used by Final Checkpoint to always load the Level set as the Open Level in here
 	FString GetOpenWorldLevelName()

EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp

@@ -745,7 +745,7 @@ void AEndlessVendettaCharacter::UpdateInventorySize(int Cols, int Rows)
 
 void AEndlessVendettaCharacter::HoldInteract()
 {
-	if (InPauseMenu) return;
+	if (InPauseMenu || !InOpenWorld) return;
 	if (PlayerOnShip)
 	{
 		ExitShip(GetActorTransform());

EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h

@@ -32,6 +32,8 @@ protected:
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category=Mesh)
 	USkeletalMeshComponent* Mesh1P;
 
+	bool InOpenWorld = false;
+
 private:
 	/** First person camera */
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Camera, meta = (AllowPrivateAccess = "true"))

EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetTutorial/GadgetTutorialStation.cpp

@@ -37,10 +37,12 @@ void AGadgetTutorialStation::Interact()
 	APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
 	PickGadgetWidget = CreateWidget<UUserWidget>(GetWorld(), PickGadgetWidgetClass);
 	PickGadgetWidget->AddToViewport(3);
+	DisableInput(PlayerController);
 	PlayerController->SetInputMode(InputMode);
 	PlayerController->bShowMouseCursor = true;
 	PlayerController->bEnableClickEvents = true;
 	PlayerController->bEnableMouseOverEvents = true;
+	EnableInput(PlayerController);
 
 	// Set up gadget menu's behaviours
 	GadgetMenu = Cast<UGadgetMenu>(PickGadgetWidget);
@@ -94,9 +96,14 @@ void AGadgetTutorialStation::SelectGadget()
 	FActorSpawnParameters SpawnParams;
 	SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
 	TSubclassOf<ABaseGadgetTutorial> GadgetTutorialToSpawnInClass = GadgetsArray[GadgetIndex]->GetDefaultObject<AGadgetBase>()->GadgetTutorialClass;
-	if (!IsValid(GadgetTutorialToSpawnInClass)) return;
+	if (!IsValid(GadgetTutorialToSpawnInClass))
+	{
+		CloseWidget();
+		return;
+	}
 	AActor* GadgetTutorialActor = GetWorld()->SpawnActor<AActor>(GadgetTutorialToSpawnInClass, GadgetTutorialSpawnTransform.GetLocation(), GadgetTutorialSpawnTransform.GetRotation().Rotator(), SpawnParams);
 	CurrentGadgetTutorial = Cast<ABaseGadgetTutorial>(GadgetTutorialActor);
+	CloseWidget();
 }
 
 void AGadgetTutorialStation::CloseWidget()