diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index a404e9315..26868ddf6 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -175,7 +175,7 @@ add_component_dir (openmw-mp/Packets/Actor PacketActorList PacketActorAuthority PacketActorTest PacketActorAI PacketActorAnimFlags PacketActorAnimPlay PacketActorAttack PacketActorCast PacketActorCellChange PacketActorDeath PacketActorEquipment PacketActorPosition - PacketActorSpeech PacketActorStatsDynamic + PacketActorSpeech PacketActorSpellsActive PacketActorStatsDynamic ) add_component_dir (openmw-mp/Packets/System diff --git a/components/openmw-mp/Controllers/ActorPacketController.cpp b/components/openmw-mp/Controllers/ActorPacketController.cpp index 5c363aa13..a56707fc6 100644 --- a/components/openmw-mp/Controllers/ActorPacketController.cpp +++ b/components/openmw-mp/Controllers/ActorPacketController.cpp @@ -10,8 +10,9 @@ #include "../Packets/Actor/PacketActorDeath.hpp" #include "../Packets/Actor/PacketActorEquipment.hpp" #include "../Packets/Actor/PacketActorPosition.hpp" -#include "../Packets/Actor/PacketActorStatsDynamic.hpp" #include "../Packets/Actor/PacketActorSpeech.hpp" +#include "../Packets/Actor/PacketActorSpellsActive.hpp" +#include "../Packets/Actor/PacketActorStatsDynamic.hpp" #include "ActorPacketController.hpp" @@ -39,6 +40,7 @@ mwmp::ActorPacketController::ActorPacketController(RakNet::RakPeerInterface *pee AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); + AddPacket(&packets, peer); AddPacket(&packets, peer); } diff --git a/components/openmw-mp/NetworkMessages.hpp b/components/openmw-mp/NetworkMessages.hpp index efa3199bc..4c6ad95aa 100644 --- a/components/openmw-mp/NetworkMessages.hpp +++ b/components/openmw-mp/NetworkMessages.hpp @@ -111,6 +111,7 @@ enum GameMessages ID_PLAYER_CAST, ID_PLAYER_ALLY, ID_WORLD_DESTINATION_OVERRIDE, + ID_ACTOR_SPELLS_ACTIVE, ID_PLACEHOLDER }; diff --git a/components/openmw-mp/Packets/Actor/PacketActorInteraction.cpp b/components/openmw-mp/Packets/Actor/PacketActorInteraction.cpp deleted file mode 100644 index 6fa6829c8..000000000 --- a/components/openmw-mp/Packets/Actor/PacketActorInteraction.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include -#include "PacketActorInteraction.hpp" - -using namespace mwmp; - -PacketActorInteraction::PacketActorInteraction(RakNet::RakPeerInterface *peer) : ActorPacket(peer) -{ - packetID = ID_ACTOR_INTERACTION; -} - -void PacketActorInteraction::Actor(BaseActor &actor, bool send) -{ - // Placeholder -} diff --git a/components/openmw-mp/Packets/Actor/PacketActorInteraction.hpp b/components/openmw-mp/Packets/Actor/PacketActorInteraction.hpp deleted file mode 100644 index fecc3382c..000000000 --- a/components/openmw-mp/Packets/Actor/PacketActorInteraction.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OPENMW_PACKETACTORINTERACTION_HPP -#define OPENMW_PACKETACTORINTERACTION_HPP - -#include - -namespace mwmp -{ - class PacketActorInteraction : public ActorPacket - { - public: - PacketActorInteraction(RakNet::RakPeerInterface *peer); - - virtual void Actor(BaseActor &actor, bool send); - }; -} - -#endif //OPENMW_PACKETACTORINTERACTION_HPP diff --git a/components/openmw-mp/Packets/Actor/PacketActorSpellsActive.cpp b/components/openmw-mp/Packets/Actor/PacketActorSpellsActive.cpp new file mode 100644 index 000000000..6a5981f8d --- /dev/null +++ b/components/openmw-mp/Packets/Actor/PacketActorSpellsActive.cpp @@ -0,0 +1,15 @@ +#include +#include +#include "PacketActorSpellsActive.hpp" + +using namespace mwmp; + +PacketActorSpellsActive::PacketActorSpellsActive(RakNet::RakPeerInterface *peer) : ActorPacket(peer) +{ + packetID = ID_ACTOR_SPELLS_ACTIVE; +} + +void PacketActorSpellsActive::Actor(BaseActor &actor, bool send) +{ + // Placeholder +} diff --git a/components/openmw-mp/Packets/Actor/PacketActorSpellsActive.hpp b/components/openmw-mp/Packets/Actor/PacketActorSpellsActive.hpp new file mode 100644 index 000000000..b3cef5b3b --- /dev/null +++ b/components/openmw-mp/Packets/Actor/PacketActorSpellsActive.hpp @@ -0,0 +1,17 @@ +#ifndef OPENMW_PACKETACTORSPELLSACTIVE_HPP +#define OPENMW_PACKETACTORSPELLSACTIVE_HPP + +#include + +namespace mwmp +{ + class PacketActorSpellsActive : public ActorPacket + { + public: + PacketActorSpellsActive(RakNet::RakPeerInterface *peer); + + virtual void Actor(BaseActor &actor, bool send); + }; +} + +#endif //OPENMW_PACKETACTORSPELLSACTIVE_HPP