From b4b248b5e7c181ce01f0f0c303d15764a107fc47 Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Sun, 21 May 2023 17:24:58 +0100
Subject: [PATCH] Bugfix Able to Shoot in Menus

---
 Content/Levels/Build.umap                                     | 4 ++--
 .../the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap
index 1e4aacb..85bf7a8 100644
--- a/Content/Levels/Build.umap
+++ b/Content/Levels/Build.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f56264589a4aaade4ce154f18d6398d236f42fbd7e57f04fefa539883d123169
-size 5623641
+oid sha256:c46e6f3a6973952487c009db51df995221db2f16f03e541e5ed11c04082b6efe
+size 5623612
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp
index 69d3e2a..5c4a249 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp
@@ -67,6 +67,7 @@ void UHoldToInitCombat::OnClickDown()
 {
 	if (!bHasBookAndGun) return;
 	if (Cast<ATurnBaseCombatV2>(GetWorld()->GetGameState())->bIsInCombat) return;
+	if (Cast<ATempCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn())->bIsInDialogue || Cast<ATempCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn())->bShopKeeperText || Cast<ATempCharacter>(GetWorld()->GetFirstPlayerController()->GetPawn())->InventoryWidget->IsVisible()) return;
 	if (ReloadTimer > 0.0f) return;
 	if (GunEffect)
 	{