From 076a14c72a5783436d11d6c2be87f4a4576ef066 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Sun, 12 May 2024 14:42:24 +0100 Subject: [PATCH] Update Pause Menu UI for Updated Layout --- .../Content/PauseMenu/WBP_PauseMenu.uasset | 4 ++-- .../Characters/BountyHunterCharacter.cpp | 14 +++++++------- .../Characters/BountyHunterCharacter.h | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset index a5d191cb..06a97069 100644 --- a/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset +++ b/EndlessVendetta/Content/PauseMenu/WBP_PauseMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2848f942161863cfbb6c7f66019127937bb0c23d2df764b10f96cb552f33de4f -size 508713 +oid sha256:41bbf4884213d8e8c386eca5d6275d9ef63856e6078ea20db2d44695899688e6 +size 118652 diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp index b5fae2c7..65ad145f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.cpp @@ -143,7 +143,7 @@ void ABountyHunterCharacter::BeginPlay() } } } - CreatePauseMenuTabs(); + //CreatePauseMenuTabs(); } void ABountyHunterCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) @@ -218,12 +218,12 @@ void ABountyHunterCharacter::TogglePauseMenu() PauseMenu = CreateWidget(GetWorld(), PauseMenuWidgetClass, FName("PauseMenu")); PauseMenu->UpdatePlayerStatistics(Money, Favours); PauseMenu->AddToViewport(50); - PauseMenu->OpenNewTab(BountiesTab); - PauseMenu->OpenedBountiesTab.AddDynamic(this, &ABountyHunterCharacter::OpenBountiesTab); - PauseMenu->OpenedFavoursTab.AddDynamic(this, &ABountyHunterCharacter::OpenFavoursTab); - PauseMenu->OpenedNavigationTab.AddDynamic(this, &ABountyHunterCharacter::OpenNavigationTab); - PauseMenu->OpenedSettingsTab.AddDynamic(this, &ABountyHunterCharacter::OpenSettingsTab); - PauseMenu->OpenedQuitTab.AddDynamic(this, &ABountyHunterCharacter::OpenQuitTab); + // PauseMenu->OpenNewTab(BountiesTab); + // PauseMenu->OpenedBountiesTab.AddDynamic(this, &ABountyHunterCharacter::OpenBountiesTab); + // PauseMenu->OpenedFavoursTab.AddDynamic(this, &ABountyHunterCharacter::OpenFavoursTab); + // PauseMenu->OpenedNavigationTab.AddDynamic(this, &ABountyHunterCharacter::OpenNavigationTab); + // PauseMenu->OpenedSettingsTab.AddDynamic(this, &ABountyHunterCharacter::OpenSettingsTab); + // PauseMenu->OpenedQuitTab.AddDynamic(this, &ABountyHunterCharacter::OpenQuitTab); PauseMenu->SetVisibility(ESlateVisibility::Visible); PauseMenu->SetFocus(); } diff --git a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h index 008db360..1523e867 100644 --- a/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/Characters/BountyHunterCharacter.h @@ -220,6 +220,7 @@ private: void CreatePauseMenuTabs(); // Open or Close the Pause Menu, Defaults to Opening Bounty Tab + UFUNCTION(BlueprintCallable) void TogglePauseMenu(); // Opens Bounties Tab