mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-04 05:51:34 +00:00
Code Issues Releases Wiki Activity

[General] Move mwmp::Attack to BaseStructs

Browse source
This commit is contained in:
David Cernat 2017-04-17 15:12:11 +03:00
parent cf155c9279
commit 2397afc6ce
2 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
components/openmw-mp/Base/BasePlayer.hpp
View file

@ -11,30 +11,13 @@
#include <components/esm/creaturestats.hpp> #include <components/esm/creaturestats.hpp>
#include <components/esm/loadclas.hpp> #include <components/esm/loadclas.hpp>
#include <components/esm/loadspel.hpp> #include <components/esm/loadspel.hpp>
#include <components/openmw-mp/Base/BaseStructs.hpp>
#include <RakNetTypes.h> #include <RakNetTypes.h>
namespace mwmp 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 struct CurrentContainer
{ {
std::string refId; std::string refId;

22
components/openmw-mp/Base/BaseStructs.hpp
View file

@ -1,8 +1,30 @@
#ifndef OPENMW_BASESTRUCTS_HPP #ifndef OPENMW_BASESTRUCTS_HPP
#define OPENMW_BASESTRUCTS_HPP #define OPENMW_BASESTRUCTS_HPP
#include <RakNetTypes.h>
namespace mwmp 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 struct Animation
{ {
std::string groupname; std::string groupname;