AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-25 22:10:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

[General] Move active spell structs from BasePlayer to BaseStructs

Browse Source
This commit is contained in:
David Cernat 2021-04-16 15:19:21 +02:00
parent cedf70f367
commit 4acf9e289b
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/openmw-mp/Base/BasePlayer.hpp
View File

@ -75,12 +75,6 @@ namespace mwmp
int type; int type;
}; };
struct ActiveSpell
{
std::string id;
ESM::ActiveSpells::ActiveSpellParams params;
};
struct CellState struct CellState
{ {
ESM::Cell cell; ESM::Cell cell;
@ -132,18 +126,6 @@ namespace mwmp
int action; // 0 - Clear and set in entirety, 1 - Add spell, 2 - Remove spell 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 enum RESURRECT_TYPE
{ {
REGULAR = 0, REGULAR = 0,

19
components/openmw-mp/Base/BaseStructs.hpp
View File

@ -3,6 +3,7 @@
#include <string> #include <string>
#include <components/esm/activespells.hpp>
#include <components/esm/loadcell.hpp> #include <components/esm/loadcell.hpp>
#include <components/esm/statstate.hpp> #include <components/esm/statstate.hpp>
@ -156,6 +157,24 @@ namespace mwmp
bool shouldSend; 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 struct Animation
{ {
std::string groupname; std::string groupname;