diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index b1f86e8..87a07a9 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -5,7 +5,7 @@ #include "Dialogs/Dialogs.h" #include "Engine/GameViewportClient.h" #include "Blueprint/UserWidget.h" -#include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" +//#include "../../../Plugins/Developer/RiderLink/Source/RD/thirdparty/clsocket/src/ActiveSocket.h" #include "the_twilight_abyss/MerchantInteraction/Interaction.h" diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp index e02484f..fd5c08d 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.cpp @@ -186,3 +186,11 @@ void ATurnBaseCombat::UpdateActionPoints() const { ActionPointsTextBlock->SetText(FText::FromString(FString::FromInt(ActiveActionPoints))); } + +void ATurnBaseCombat::AddBattleLogMessage(FString Message) +{ + FString* tempTextBlock; + BattleLog.Enqueue(Message); + tempTextBlock = BattleLog.Peek(); + +} diff --git a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h index b703434..83073b7 100644 --- a/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombat/TurnBaseCombat.h @@ -48,6 +48,9 @@ public: {"FW", 20} }; + UPROPERTY(EditAnywhere) + TQueue BattleLog; + protected: virtual void BeginPlay() override; void ExecuteCast(FString Combo); @@ -110,4 +113,6 @@ private: void UpdateComboString(FString NewCombo) const; void UpdateActionPoints() const; + + void AddBattleLogMessage(FString Message); }; \ No newline at end of file