[General] Rename PacketActorFrame into PacketActorTest

apps/openmw-mp/ProcessorInitializer.cpp

@@ -27,7 +27,7 @@
 #include "ActorProcessor.hpp"
 #include "processors/actor/ProcessorActorList.hpp"
 #include "processors/actor/ProcessorActorAuthority.hpp"
-#include "processors/actor/ProcessorActorFrame.hpp"
+#include "processors/actor/ProcessorActorTest.hpp"
 #include "WorldProcessor.hpp"
 #include "processors/world/ProcessorContainer.hpp"
 #include "processors/world/ProcessorDoorState.hpp"
@@ -73,7 +73,7 @@ void ProcessorInitializer()
 
     ActorProcessor::AddProcessor(new ProcessorActorList());
     ActorProcessor::AddProcessor(new ProcessorActorAuthority());
-    ActorProcessor::AddProcessor(new ProcessorActorFrame());
+    ActorProcessor::AddProcessor(new ProcessorActorTest());
 
     WorldProcessor::AddProcessor(new ProcessorContainer());
     WorldProcessor::AddProcessor(new ProcessorDoorState());

apps/openmw-mp/Script/ScriptFunctions.hpp

@@ -124,7 +124,7 @@ public:
             {"OnPlayerSpellbookChange",  Function<void, unsigned short>()},
             {"OnPlayerJournalChange",    Function<void, unsigned short>()},
             {"OnActorList",              Function<void, unsigned short, const char*>()},
-            {"OnActorFrame",             Function<void, unsigned short, const char*>()},
+            {"OnActorTest",              Function<void, unsigned short, const char*>()},
             {"OnObjectPlace",            Function<void, unsigned short, const char*>()},
             {"OnObjectDelete",           Function<void, unsigned short, const char*>()},
             {"OnObjectScale",            Function<void, unsigned short, const char*>()},

apps/openmw-mp/processors/actor/ProcessorActorTest.hpp

@@ -1,16 +1,16 @@
-#ifndef OPENMW_PROCESSORACTORFRAME_HPP
+#ifndef OPENMW_PROCESSORACTORTEST_HPP
-#define OPENMW_PROCESSORACTORFRAME_HPP
+#define OPENMW_PROCESSORACTORTEST_HPP
 
 #include "apps/openmw-mp/ActorProcessor.hpp"
 
 namespace mwmp
 {
-    class ProcessorActorFrame : public ActorProcessor
+    class ProcessorActorTest : public ActorProcessor
     {
     public:
-        ProcessorActorFrame()
+        ProcessorActorTest()
         {
-            BPP_INIT(ID_ACTOR_FRAME)
+            BPP_INIT(ID_ACTOR_TEST)
         }
 
         void Do(ActorPacket &packet, Player &player, BaseActorList &actorList) override
@@ -21,9 +21,9 @@ namespace mwmp
             if (serverCell != nullptr)
                 serverCell->sendToLoaded(&packet, &actorList);
 
-            Script::Call<Script::CallbackIdentity("OnActorFrame")>(player.getId(), actorList.cell.getDescription().c_str());
+            Script::Call<Script::CallbackIdentity("OnActorTest")>(player.getId(), actorList.cell.getDescription().c_str());
         }
     };
 }
 
-#endif //OPENMW_PROCESSORACTORFRAME_HPP
+#endif //OPENMW_PROCESSORACTORTEST_HPP

apps/openmw/mwmp/Cell.cpp

@@ -57,8 +57,8 @@ void Cell::updateLocal()
         }
     }
 
-    Main::get().getNetworking()->getActorPacket(ID_ACTOR_FRAME)->setActorList(actorList);
+    Main::get().getNetworking()->getActorPacket(ID_ACTOR_TEST)->setActorList(actorList);
-    Main::get().getNetworking()->getActorPacket(ID_ACTOR_FRAME)->Send();
+    Main::get().getNetworking()->getActorPacket(ID_ACTOR_TEST)->Send();
 }
 
 void Cell::updateDedicated(float dt)

apps/openmw/mwmp/Networking.cpp

@@ -865,7 +865,7 @@ void Networking::processActorPacket(RakNet::Packet *packet)
 
         break;
     }
-    case ID_ACTOR_FRAME:
+    case ID_ACTOR_TEST:
     {
         //Main::get().getCellController()->readCellFrame(actorList);
 

components/CMakeLists.txt

@@ -167,7 +167,7 @@ add_component_dir (openmw-mp
 
         Packets/Player/PacketGUIBoxes Packets/Player/PacketTime
 
-        Packets/Actor/PacketActorList Packets/Actor/PacketActorAuthority Packets/Actor/PacketActorFrame
+        Packets/Actor/PacketActorList Packets/Actor/PacketActorAuthority Packets/Actor/PacketActorTest
 
         Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace Packets/World/PacketObjectScale
         Packets/World/PacketObjectLock Packets/World/PacketObjectUnlock Packets/World/PacketObjectMove

components/openmw-mp/Controllers/ActorPacketController.cpp

@@ -4,7 +4,7 @@
 
 #include "../Packets/Actor/PacketActorList.hpp"
 #include "../Packets/Actor/PacketActorAuthority.hpp"
-#include "../Packets/Actor/PacketActorFrame.hpp"
+#include "../Packets/Actor/PacketActorTest.hpp"
 
 #include "ActorPacketController.hpp"
 
@@ -20,7 +20,7 @@ mwmp::ActorPacketController::ActorPacketController(RakNet::RakPeerInterface *pee
 {
     AddPacket<PacketActorList>(&packets, peer);
     AddPacket<PacketActorAuthority>(&packets, peer);
-    AddPacket<PacketActorFrame>(&packets, peer);
+    AddPacket<PacketActorTest>(&packets, peer);
 }
 
 

components/openmw-mp/NetworkMessages.hpp

@@ -41,7 +41,7 @@ enum GameMessages
 
     ID_ACTOR_LIST,
     ID_ACTOR_AUTHORITY,
-    ID_ACTOR_FRAME,
+    ID_ACTOR_TEST,
 
     ID_OBJECT_PLACE,
     ID_OBJECT_DELETE,

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

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

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

@@ -1,15 +1,15 @@
 #include <components/openmw-mp/NetworkMessages.hpp>
 #include <components/openmw-mp/Log.hpp>
-#include "PacketActorFrame.hpp"
+#include "PacketActorTest.hpp"
 
 using namespace mwmp;
 
-PacketActorFrame::PacketActorFrame(RakNet::RakPeerInterface *peer) : ActorPacket(peer)
+PacketActorTest::PacketActorTest(RakNet::RakPeerInterface *peer) : ActorPacket(peer)
 {
-    packetID = ID_ACTOR_FRAME;
+    packetID = ID_ACTOR_TEST;
 }
 
-void PacketActorFrame::Packet(RakNet::BitStream *bs, bool send)
+void PacketActorTest::Packet(RakNet::BitStream *bs, bool send)
 {
     ActorPacket::Packet(bs, send);
 

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

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