diff --git a/apps/openmw-mp/ProcessorInitializer.cpp b/apps/openmw-mp/ProcessorInitializer.cpp index 26d5d5e5d..4c56ed362 100644 --- a/apps/openmw-mp/ProcessorInitializer.cpp +++ b/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()); diff --git a/apps/openmw-mp/Script/ScriptFunctions.hpp b/apps/openmw-mp/Script/ScriptFunctions.hpp index 01635ce4a..be1b80bf5 100644 --- a/apps/openmw-mp/Script/ScriptFunctions.hpp +++ b/apps/openmw-mp/Script/ScriptFunctions.hpp @@ -124,7 +124,7 @@ public: {"OnPlayerSpellbookChange", Function()}, {"OnPlayerJournalChange", Function()}, {"OnActorList", Function()}, - {"OnActorFrame", Function()}, + {"OnActorTest", Function()}, {"OnObjectPlace", Function()}, {"OnObjectDelete", Function()}, {"OnObjectScale", Function()}, diff --git a/apps/openmw-mp/processors/actor/ProcessorActorFrame.hpp b/apps/openmw-mp/processors/actor/ProcessorActorTest.hpp similarity index 56% rename from apps/openmw-mp/processors/actor/ProcessorActorFrame.hpp rename to apps/openmw-mp/processors/actor/ProcessorActorTest.hpp index 7e43823cf..20107b5f5 100644 --- a/apps/openmw-mp/processors/actor/ProcessorActorFrame.hpp +++ b/apps/openmw-mp/processors/actor/ProcessorActorTest.hpp @@ -1,16 +1,16 @@ -#ifndef OPENMW_PROCESSORACTORFRAME_HPP -#define OPENMW_PROCESSORACTORFRAME_HPP +#ifndef OPENMW_PROCESSORACTORTEST_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(player.getId(), actorList.cell.getDescription().c_str()); + Script::Call(player.getId(), actorList.cell.getDescription().c_str()); } }; } -#endif //OPENMW_PROCESSORACTORFRAME_HPP +#endif //OPENMW_PROCESSORACTORTEST_HPP diff --git a/apps/openmw/mwmp/Cell.cpp b/apps/openmw/mwmp/Cell.cpp index e50513ba5..8a9324d31 100644 --- a/apps/openmw/mwmp/Cell.cpp +++ b/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_FRAME)->Send(); + Main::get().getNetworking()->getActorPacket(ID_ACTOR_TEST)->setActorList(actorList); + Main::get().getNetworking()->getActorPacket(ID_ACTOR_TEST)->Send(); } void Cell::updateDedicated(float dt) diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index 8ed112e64..2e6c2a164 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/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); diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 4c3913b05..6976a86cc 100644 --- a/components/CMakeLists.txt +++ b/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 diff --git a/components/openmw-mp/Controllers/ActorPacketController.cpp b/components/openmw-mp/Controllers/ActorPacketController.cpp index b7033f10a..e94a5ff55 100644 --- a/components/openmw-mp/Controllers/ActorPacketController.cpp +++ b/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(&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 cfd7e7afa..91e98398f 100644 --- a/components/openmw-mp/NetworkMessages.hpp +++ b/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, diff --git a/components/openmw-mp/Packets/Actor/PacketActorFrame.hpp b/components/openmw-mp/Packets/Actor/PacketActorFrame.hpp deleted file mode 100644 index 942fd2cd8..000000000 --- a/components/openmw-mp/Packets/Actor/PacketActorFrame.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OPENMW_PACKETACTORFRAME_HPP -#define OPENMW_PACKETACTORFRAME_HPP - -#include - -namespace mwmp -{ - class PacketActorFrame : public ActorPacket - { - public: - PacketActorFrame(RakNet::RakPeerInterface *peer); - - virtual void Packet(RakNet::BitStream *bs, bool send); - }; -} - -#endif //OPENMW_PACKETACTORFRAME_HPP diff --git a/components/openmw-mp/Packets/Actor/PacketActorFrame.cpp b/components/openmw-mp/Packets/Actor/PacketActorTest.cpp similarity index 89% rename from components/openmw-mp/Packets/Actor/PacketActorFrame.cpp rename to components/openmw-mp/Packets/Actor/PacketActorTest.cpp index a6ad35a21..c97d3bede 100644 --- a/components/openmw-mp/Packets/Actor/PacketActorFrame.cpp +++ b/components/openmw-mp/Packets/Actor/PacketActorTest.cpp @@ -1,15 +1,15 @@ #include #include -#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); diff --git a/components/openmw-mp/Packets/Actor/PacketActorTest.hpp b/components/openmw-mp/Packets/Actor/PacketActorTest.hpp new file mode 100644 index 000000000..c8b16edc9 --- /dev/null +++ b/components/openmw-mp/Packets/Actor/PacketActorTest.hpp @@ -0,0 +1,17 @@ +#ifndef OPENMW_PACKETACTORTEST_HPP +#define OPENMW_PACKETACTORTEST_HPP + +#include + +namespace mwmp +{ + class PacketActorTest : public ActorPacket + { + public: + PacketActorTest(RakNet::RakPeerInterface *peer); + + virtual void Packet(RakNet::BitStream *bs, bool send); + }; +} + +#endif //OPENMW_PACKETACTORTEST_HPP