diff --git a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp index c0f2bdb..ebea482 100644 --- a/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp +++ b/Source/the_twilight_abyss/Dialogue/DialogueNPC.cpp @@ -116,6 +116,7 @@ void UDialogueNPC::TickComponent(float DeltaTime, ELevelTick TickType, FActorCom void UDialogueNPC::StartDialogue() { + Quests.Empty(); FOutputDeviceNull AR; const FString Command = FString::Printf(TEXT("SetRootDialoguePath")); GetOwner()->CallFunctionByNameWithArguments(*Command, AR, nullptr, true); @@ -166,7 +167,6 @@ void UDialogueNPC::EndDialogue() UDialoguePath* UDialogueNPC::CreateRootDialoguePath() { - //RootDialoguePath = NewObject(); return NewObject(); } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index afabe2f..77c5aa7 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -8,9 +8,7 @@ #include "GameFramework/CharacterMovementComponent.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" #include - #include "Components/PawnNoiseEmitterComponent.h" -#include "Components/SphereComponent.h" #include "Kismet/KismetMathLibrary.h" diff --git a/Source/the_twilight_abyss/Quest/QuestSystem.h b/Source/the_twilight_abyss/Quest/QuestSystem.h index 149d519..4c776ed 100644 --- a/Source/the_twilight_abyss/Quest/QuestSystem.h +++ b/Source/the_twilight_abyss/Quest/QuestSystem.h @@ -65,6 +65,7 @@ public: bool HasQuestFlag(FString FlagName) const; private: + UPROPERTY() UInventoryComponent* PlayerInventory; // Quest Widget diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h index 3073647..0e4cb37 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusEffect.h @@ -3,7 +3,6 @@ #pragma once #include "CoreMinimal.h" -#include "UObject/NoExportTypes.h" #include "StatusEffect.generated.h" /**