Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Bugfix Choosing Another Option Other Than a Add Quest Breaks Dialogue

Browse Source
This commit is contained in:
Philip W 2023-05-04 06:59:05 +01:00
parent daaa624dd9
commit 2ab212324b
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp
View File

@ -116,6 +116,7 @@ void UDialogueNPC::TickComponent(float DeltaTime, ELevelTick TickType, FActorCom
void UDialogueNPC::StartDialogue() void UDialogueNPC::StartDialogue()
{ {
Quests.Empty();
FOutputDeviceNull AR; FOutputDeviceNull AR;
const FString Command = FString::Printf(TEXT("SetRootDialoguePath")); const FString Command = FString::Printf(TEXT("SetRootDialoguePath"));
GetOwner()->CallFunctionByNameWithArguments(*Command, AR, nullptr, true); GetOwner()->CallFunctionByNameWithArguments(*Command, AR, nullptr, true);
@ -166,7 +167,6 @@ void UDialogueNPC::EndDialogue()
UDialoguePath* UDialogueNPC::CreateRootDialoguePath() UDialoguePath* UDialogueNPC::CreateRootDialoguePath()
{ {
//RootDialoguePath = NewObject<UDialoguePath>();
return NewObject<UDialoguePath>(); return NewObject<UDialoguePath>();
} }

2
Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
View File

@ -8,9 +8,7 @@
#include "GameFramework/CharacterMovementComponent.h" #include "GameFramework/CharacterMovementComponent.h"
#include "the_twilight_abyss/MerchantInteraction/Interaction.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h"
#include <Runtime/Engine/Classes/Kismet/GameplayStatics.h> #include <Runtime/Engine/Classes/Kismet/GameplayStatics.h>
#include "Components/PawnNoiseEmitterComponent.h" #include "Components/PawnNoiseEmitterComponent.h"
#include "Components/SphereComponent.h"
#include "Kismet/KismetMathLibrary.h" #include "Kismet/KismetMathLibrary.h"

1
Source/the_twilight_abyss/Quest/QuestSystem.h
View File

@ -65,6 +65,7 @@ public:
bool HasQuestFlag(FString FlagName) const; bool HasQuestFlag(FString FlagName) const;
private: private:
UPROPERTY()
UInventoryComponent* PlayerInventory; UInventoryComponent* PlayerInventory;
// Quest Widget // Quest Widget

1
Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h
View File

@ -3,7 +3,6 @@
#pragma once #pragma once
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "UObject/NoExportTypes.h"
#include "StatusEffect.generated.h" #include "StatusEffect.generated.h"
/** /**