teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[General] Rename PacketActorFrame into PacketActorTest

Browse source
This commit is contained in:
David Cernat 2017-04-10 08:37:18 +03:00
parent a5d0486c82
commit 174f316787
11 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw-mp/ProcessorInitializer.cpp
View file

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

2
apps/openmw-mp/Script/ScriptFunctions.hpp
View file

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

14
apps/openmw-mp/processors/actor/ProcessorActorFrame.hpp → apps/openmw-mp/processors/actor/ProcessorActorTest.hpp
View file

@ -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" #include "apps/openmw-mp/ActorProcessor.hpp"
namespace mwmp namespace mwmp
{ {
class ProcessorActorFrame : public ActorProcessor class ProcessorActorTest : public ActorProcessor
{ {
public: public:
ProcessorActorFrame() ProcessorActorTest()
{ {
BPP_INIT(ID_ACTOR_FRAME) BPP_INIT(ID_ACTOR_TEST)
} }
void Do(ActorPacket &packet, Player &player, BaseActorList &actorList) override void Do(ActorPacket &packet, Player &player, BaseActorList &actorList) override
@ -21,9 +21,9 @@ namespace mwmp
if (serverCell != nullptr) if (serverCell != nullptr)
serverCell->sendToLoaded(&packet, &actorList); 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

4
apps/openmw/mwmp/Cell.cpp
View file

@ -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) void Cell::updateDedicated(float dt)

2
apps/openmw/mwmp/Networking.cpp
View file

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

2
components/CMakeLists.txt
View file

@ -167,7 +167,7 @@ add_component_dir (openmw-mp
Packets/Player/PacketGUIBoxes Packets/Player/PacketTime 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/PacketObjectDelete Packets/World/PacketObjectPlace Packets/World/PacketObjectScale
Packets/World/PacketObjectLock Packets/World/PacketObjectUnlock Packets/World/PacketObjectMove Packets/World/PacketObjectLock Packets/World/PacketObjectUnlock Packets/World/PacketObjectMove

4
components/openmw-mp/Controllers/ActorPacketController.cpp
View file

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

2
components/openmw-mp/NetworkMessages.hpp
View file

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

17
components/openmw-mp/Packets/Actor/PacketActorFrame.hpp
View file

@ -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

8
components/openmw-mp/Packets/Actor/PacketActorFrame.cpp → components/openmw-mp/Packets/Actor/PacketActorTest.cpp
View file

@ -1,15 +1,15 @@
#include <components/openmw-mp/NetworkMessages.hpp> #include <components/openmw-mp/NetworkMessages.hpp>
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
#include "PacketActorFrame.hpp" #include "PacketActorTest.hpp"
using namespace mwmp; 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); ActorPacket::Packet(bs, send);

17
components/openmw-mp/Packets/Actor/PacketActorTest.hpp Normal file
View file

@ -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