From c880eb27ac951c30f44d235e20e6c8e0907e288a Mon Sep 17 00:00:00 2001
From: PHILIP White <PW259246@falmouth.ac.uk>
Date: Thu, 23 Feb 2023 01:05:27 +0000
Subject: [PATCH] Updated StatusSystem Struct for Bool Comparisons
---
Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp | 2 +-
Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.h | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp
index 58f10ab..1baa68f 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.cpp
@@ -34,7 +34,7 @@ void UStatusSystem::TickComponent(float DeltaTime, ELevelTick TickType, FActorCo
{
if (StatusEffect.TimeTillExpiry > UGameplayStatics::GetRealTimeSeconds(GetWorld()))
{
- //ActiveStatusEffects.RemoveAt(ActiveStatusEffects.Find(StatusEffect));
+ ActiveStatusEffects.Remove(StatusEffect);
}
}
}
diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.h b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.h
index a1b65ea..f80e070 100644
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.h
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/StatusSystem.h
@@ -19,6 +19,11 @@ struct FActiveStatusEffect
UPROPERTY()
UStatusEffect* StatusEffect;
+
+ bool operator==(const FActiveStatusEffect& Comp) const
+ {
+ return StatusEffect == Comp.StatusEffect;
+ }
};
UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) )