From 4acf9e289b4652bdbdda68cc78917ebba815bf83 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Fri, 16 Apr 2021 15:19:21 +0200
Subject: [PATCH] [General] Move active spell structs from BasePlayer to
 BaseStructs

---
 components/openmw-mp/Base/BasePlayer.hpp  | 18 ------------------
 components/openmw-mp/Base/BaseStructs.hpp | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/components/openmw-mp/Base/BasePlayer.hpp b/components/openmw-mp/Base/BasePlayer.hpp
index ff9dc0e2a..35dab08c7 100644
--- a/components/openmw-mp/Base/BasePlayer.hpp
+++ b/components/openmw-mp/Base/BasePlayer.hpp
@@ -75,12 +75,6 @@ namespace mwmp
         int type;
     };
 
-    struct ActiveSpell
-    {
-        std::string id;
-        ESM::ActiveSpells::ActiveSpellParams params;
-    };
-
     struct CellState
     {
         ESM::Cell cell;
@@ -132,18 +126,6 @@ namespace mwmp
         int action; // 0 - Clear and set in entirety, 1 - Add spell, 2 - Remove spell
     };
 
-    struct SpellsActiveChanges
-    {
-        std::vector<ActiveSpell> activeSpells;
-        enum ACTION_TYPE
-        {
-            SET = 0,
-            ADD,
-            REMOVE
-        };
-        int action; // 0 - Clear and set in entirety, 1 - Add spell, 2 - Remove spell
-    };
-
     enum RESURRECT_TYPE
     {
         REGULAR = 0,
diff --git a/components/openmw-mp/Base/BaseStructs.hpp b/components/openmw-mp/Base/BaseStructs.hpp
index 1dc082b8e..5b965693e 100644
--- a/components/openmw-mp/Base/BaseStructs.hpp
+++ b/components/openmw-mp/Base/BaseStructs.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 
+#include <components/esm/activespells.hpp>
 #include <components/esm/loadcell.hpp>
 #include <components/esm/statstate.hpp>
 
@@ -156,6 +157,24 @@ namespace mwmp
         bool shouldSend;
     };
 
+    struct ActiveSpell
+    {
+        std::string id;
+        ESM::ActiveSpells::ActiveSpellParams params;
+    };
+
+    struct SpellsActiveChanges
+    {
+        std::vector<ActiveSpell> activeSpells;
+        enum ACTION_TYPE
+        {
+            SET = 0,
+            ADD,
+            REMOVE
+        };
+        int action; // 0 - Clear and set in entirety, 1 - Add spell, 2 - Remove spell
+    };
+
     struct Animation
     {
         std::string groupname;