Add packet ActiveSkills

components/CMakeLists.txt

@@ -156,6 +156,7 @@ add_component_dir (openmw-mp
         Packets/Player/PacketAttribute Packets/Player/PacketSkill Packets/Player/PacketLevel
         Packets/Player/PacketHandshake Packets/Player/PacketGUIBoxes Packets/Player/PacketClass
         Packets/Player/PacketTime Packets/Player/PacketInventory Packets/Player/PacketSpellbook
+        Packets/Player/PacketActiveSkills
 
         Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace Packets/World/PacketObjectLock
         Packets/World/PacketObjectUnlock Packets/World/PacketObjectScale Packets/World/PacketObjectMove

components/openmw-mp/Base/BasePlayer.hpp

@@ -196,6 +196,7 @@ namespace mwmp
         Spellbook spellbook;
         bool consoleAllowed;
         bool ignorePosPacket;
+        ESM::ActiveSpells activeSpells;
 
     protected:
         ESM::Position pos;

components/openmw-mp/NetworkMessages.hpp

@@ -33,6 +33,7 @@ enum GameMessages
     ID_GAME_TIME,
     ID_GAME_INVENTORY,
     ID_GAME_SPELLBOOK,
+    ID_GAME_ACTIVESKILLS,
 
     ID_OBJECT_PLACE,
     ID_OBJECT_DELETE,

components/openmw-mp/Packets/Player/PacketActiveSkills.cpp

@@ -0,0 +1,58 @@
+//
+// Created by koncord on 03.12.16.
+//
+
+#include "PacketActiveSkills.hpp"
+#include <components/openmw-mp/NetworkMessages.hpp>
+
+using namespace mwmp;
+
+PacketActiveSkills::PacketActiveSkills(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
+{
+    packetID = ID_GAME_ACTIVESKILLS;
+}
+
+void PacketActiveSkills::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
+{
+    PlayerPacket::Packet(bs, player, send);
+
+    unsigned long spells = 0;
+
+    if (send)
+        spells = player->activeSpells.mSpells.size();
+
+    RW(spells, send);
+
+    if (send)
+        for (ESM::ActiveSpells::TContainer::const_iterator spell = player->activeSpells.mSpells.begin();
+             spell != player->activeSpells.mSpells.end(); ++spell)
+        {
+            RW(spell->first, true);
+            RW(spell->second.mTimeStamp, true);
+            unsigned long effects = spell->second.mEffects.size();
+            RW(effects, true);
+
+            for (std::vector<ESM::ActiveEffect>::const_iterator effect = spell->second.mEffects.begin();
+                 effect != spell->second.mEffects.end(); ++effect)
+                RW(effect, true);
+
+        }
+    else
+        for (unsigned int i = 0; i < spells; i++)
+        {
+            ESM::ActiveSpells::TContainer::value_type spell;
+
+            RW(spell.first, false);
+            RW(spell.second.mTimeStamp, false);
+            unsigned long effects;
+            RW(effects, false);
+
+            ESM::ActiveEffect effect;
+            for (unsigned int j = 0; j < effects; j++)
+            {
+                RW(effect, false);
+                spell.second.mEffects.push_back(effect);
+            }
+            player->activeSpells.mSpells.insert(spell);
+        }
+}

components/openmw-mp/Packets/Player/PacketActiveSkills.hpp

@@ -0,0 +1,21 @@
+//
+// Created by koncord on 03.12.16.
+//
+
+#ifndef OPENMW_PACKETACTIVESKILLS_HPP
+#define OPENMW_PACKETACTIVESKILLS_HPP
+
+#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
+
+namespace mwmp
+{
+    class PacketActiveSkills : public PlayerPacket
+    {
+    public:
+        PacketActiveSkills(RakNet::RakPeerInterface *peer);
+
+        virtual void Packet(RakNet::BitStream *bs, BasePlayer *player, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETACTIVESKILLS_HPP