Add MagicItem::IsHostile

powerof3 · Jan 18, 2024 · 248c2d2 · 248c2d2
1 parent 78f140e
commit 248c2d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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<std::uint32_t> LearnNextEffect();

diff --git 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
@@ -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
@@ -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);