From 248c2d26f214aa4385f0ddeba71e8b61640af85c Mon Sep 17 00:00:00 2001 From: powerof3 <32599957+powerof3@users.noreply.github.com> Date: Thu, 18 Jan 2024 16:24:20 +0530 Subject: [PATCH] Add `MagicItem::IsHostile` --- include/RE/I/IngredientItem.h | 1 - include/RE/M/MagicItem.h | 1 + src/RE/I/IngredientItem.cpp | 5 ----- src/RE/M/MagicItem.cpp | 5 +++++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/RE/I/IngredientItem.h b/include/RE/I/IngredientItem.h index f159359e8..3884ff2b4 100644 --- a/include/RE/I/IngredientItem.h +++ b/include/RE/I/IngredientItem.h @@ -99,7 +99,6 @@ namespace RE // override (BGSKeywordForm) [[nodiscard]] BGSKeyword* GetDefaultKeyword() const override; // 05 - [[nodiscard]] bool IsHostile() const; bool LearnEffect(std::uint32_t a_index); bool LearnEffect(EffectSetting* a_effect); std::optional LearnNextEffect(); diff --git a/include/RE/M/MagicItem.h b/include/RE/M/MagicItem.h index 1da6b0779..fc9310bf3 100644 --- a/include/RE/M/MagicItem.h +++ b/include/RE/M/MagicItem.h @@ -118,6 +118,7 @@ namespace RE [[nodiscard]] std::int32_t GetLargestArea() const; [[nodiscard]] std::uint32_t GetLongestDuration() const; [[nodiscard]] bool HasEffect(EffectArchetype a_archetype); + [[nodiscard]] bool IsHostile() const; [[nodiscard]] bool IsPermanent() const; void Traverse(MagicItemTraversalFunctor& a_visitor) const; diff --git a/src/RE/I/IngredientItem.cpp b/src/RE/I/IngredientItem.cpp index 88f2f1339..3b31df0c4 100644 --- a/src/RE/I/IngredientItem.cpp +++ b/src/RE/I/IngredientItem.cpp @@ -4,11 +4,6 @@ namespace RE { - bool IngredientItem::IsHostile() const - { - return hostileCount > 0; - } - bool IngredientItem::LearnEffect(std::uint32_t a_index) { if (a_index < 4) { diff --git a/src/RE/M/MagicItem.cpp b/src/RE/M/MagicItem.cpp index 1bf83c274..785d9ff7e 100644 --- a/src/RE/M/MagicItem.cpp +++ b/src/RE/M/MagicItem.cpp @@ -73,6 +73,11 @@ namespace RE return func(this, a_archetype); } + bool MagicItem::IsHostile() const + { + return hostileCount > 0; + } + bool MagicItem::IsPermanent() const { using func_t = decltype(&MagicItem::IsPermanent);