[General] Rename unused ActorInteraction into ActorSpellsActive

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

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<PacketActorEquipment>(&packets, peer);
     AddPacket<PacketActorPosition>(&packets, peer);
     AddPacket<PacketActorSpeech>(&packets, peer);
+    AddPacket<PacketActorSpellsActive>(&packets, peer);
     AddPacket<PacketActorStatsDynamic>(&packets, peer);
 }
 

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
 };
 

components/openmw-mp/Packets/Actor/PacketActorInteraction.cpp

@@ -1,15 +0,0 @@
-#include <components/openmw-mp/NetworkMessages.hpp>
-#include <components/openmw-mp/TimedLog.hpp>
-#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
-}

components/openmw-mp/Packets/Actor/PacketActorInteraction.hpp

@@ -1,17 +0,0 @@
-#ifndef OPENMW_PACKETACTORINTERACTION_HPP
-#define OPENMW_PACKETACTORINTERACTION_HPP
-
-#include <components/openmw-mp/Packets/Actor/ActorPacket.hpp>
-
-namespace mwmp
-{
-    class PacketActorInteraction : public ActorPacket
-    {
-    public:
-        PacketActorInteraction(RakNet::RakPeerInterface *peer);
-
-        virtual void Actor(BaseActor &actor, bool send);
-    };
-}
-
-#endif //OPENMW_PACKETACTORINTERACTION_HPP

components/openmw-mp/Packets/Actor/PacketActorSpellsActive.cpp

@@ -0,0 +1,15 @@
+#include <components/openmw-mp/NetworkMessages.hpp>
+#include <components/openmw-mp/TimedLog.hpp>
+#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
+}

components/openmw-mp/Packets/Actor/PacketActorSpellsActive.hpp

@@ -0,0 +1,17 @@
+#ifndef OPENMW_PACKETACTORSPELLSACTIVE_HPP
+#define OPENMW_PACKETACTORSPELLSACTIVE_HPP
+
+#include <components/openmw-mp/Packets/Actor/ActorPacket.hpp>
+
+namespace mwmp
+{
+    class PacketActorSpellsActive : public ActorPacket
+    {
+    public:
+        PacketActorSpellsActive(RakNet::RakPeerInterface *peer);
+
+        virtual void Actor(BaseActor &actor, bool send);
+    };
+}
+
+#endif //OPENMW_PACKETACTORSPELLSACTIVE_HPP