From 81a306f7b0d9870cab306610931854c44357c815 Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Sun, 21 May 2023 21:30:27 +0100
Subject: [PATCH] Bugfix Able to Open Dialogue in Merchant

---
 Source/the_twilight_abyss/Dialogue/InteractNPC.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/the_twilight_abyss/Dialogue/InteractNPC.cpp b/Source/the_twilight_abyss/Dialogue/InteractNPC.cpp
index 788f950..0c49cf2 100644
--- a/Source/the_twilight_abyss/Dialogue/InteractNPC.cpp
+++ b/Source/the_twilight_abyss/Dialogue/InteractNPC.cpp
@@ -4,6 +4,7 @@
 #include "InteractNPC.h"
 #include "DialogueNPC.h"
 #include "Camera/CameraComponent.h"
+#include "the_twilight_abyss/PlayerTemp/TempCharacter.h"
 
 
 // Sets default values for this component's properties
@@ -47,6 +48,7 @@ void UInteractNPC::Interact()
 		if (HitResult.GetActor()->Tags.Contains("NPC"))
 		{
 			//DrawDebugLine(GetWorld(), Start, End, FColor::Green, false, 5.0f, 0, 10.0f);
+			if (Cast<ATempCharacter>(GetOwner())->bShopKeeperText) return;
 			UDialogueNPC* DialogueNPC = HitResult.GetActor()->FindComponentByClass<UDialogueNPC>();
 			if (DialogueNPC->bIsInDialogue)
 			{