diff --git a/components/openmw-mp/Base/BasePlayer.hpp b/components/openmw-mp/Base/BasePlayer.hpp index ee524d39c..6c35e47d1 100644 --- a/components/openmw-mp/Base/BasePlayer.hpp +++ b/components/openmw-mp/Base/BasePlayer.hpp @@ -11,30 +11,13 @@ #include #include #include + +#include + #include namespace mwmp { - class Attack - { - public: - RakNet::RakNetGUID target; - RakNet::RakNetGUID attacker; - char type; // 0 - melee, 1 - magic, 2 - throwable - enum TYPE - { - MELEE = 0, - MAGIC, - THROWABLE - }; - std::string refId; // id of spell (e.g. "fireball") - char success; - char block; - float damage; - char pressed; - char knockdown; - }; - struct CurrentContainer { std::string refId; diff --git a/components/openmw-mp/Base/BaseStructs.hpp b/components/openmw-mp/Base/BaseStructs.hpp index c51f78db9..0ddbe1efb 100644 --- a/components/openmw-mp/Base/BaseStructs.hpp +++ b/components/openmw-mp/Base/BaseStructs.hpp @@ -1,8 +1,30 @@ #ifndef OPENMW_BASESTRUCTS_HPP #define OPENMW_BASESTRUCTS_HPP +#include + namespace mwmp { + class Attack + { + public: + RakNet::RakNetGUID target; + RakNet::RakNetGUID attacker; + char type; // 0 - melee, 1 - magic, 2 - throwable + enum TYPE + { + MELEE = 0, + MAGIC, + THROWABLE + }; + std::string refId; // id of spell (e.g. "fireball") + char success; + char block; + float damage; + char pressed; + char knockdown; + }; + struct Animation { std::string groupname;