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

Merge pull request #422 from TES3MP/0.6.3 while resolving conflicts

Browse source 
# Conflicts:
#   apps/openmw-mp/Networking.cpp
#   apps/openmw-mp/Networking.hpp
#   apps/openmw-mp/Script/Functions/World.cpp
#   apps/openmw-mp/processors/WorldProcessor.cpp
#   apps/openmw-mp/processors/WorldProcessor.hpp
#   apps/openmw-mp/processors/world/ProcessorContainer.hpp
#   apps/openmw-mp/processors/world/ProcessorDoorState.hpp
#   apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp
#   apps/openmw-mp/processors/world/ProcessorObjectLock.hpp
#   apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp
#   apps/openmw-mp/processors/world/ProcessorObjectScale.hpp
#   apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp
#   apps/openmw-mp/processors/world/ProcessorObjectState.hpp
#   apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp
#   apps/openmw/mwmp/Networking.cpp
#   components/CMakeLists.txt
#   components/openmw-mp/Controllers/ObjectPacketController.hpp
#   components/openmw-mp/Controllers/WorldPacketController.cpp
#   components/openmw-mp/Packets/Object/ObjectPacket.cpp
#   components/openmw-mp/Packets/Object/ObjectPacket.hpp
#   components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp
#   components/openmw-mp/Packets/Object/PacketContainer.hpp
#   components/openmw-mp/Packets/Object/PacketDoorState.hpp
#   components/openmw-mp/Packets/Object/PacketMusicPlay.hpp
#   components/openmw-mp/Packets/Object/PacketObjectAnimPlay.hpp
#   components/openmw-mp/Packets/Object/PacketObjectDelete.hpp
#   components/openmw-mp/Packets/Object/PacketObjectLock.hpp
#   components/openmw-mp/Packets/Object/PacketObjectMove.hpp
#   components/openmw-mp/Packets/Object/PacketObjectPlace.hpp
#   components/openmw-mp/Packets/Object/PacketObjectRotate.hpp
#   components/openmw-mp/Packets/Object/PacketObjectScale.hpp
#   components/openmw-mp/Packets/Object/PacketObjectSpawn.hpp
#   components/openmw-mp/Packets/Object/PacketObjectState.hpp
#   components/openmw-mp/Packets/Object/PacketObjectTrap.hpp
#   components/openmw-mp/Packets/Object/PacketScriptGlobalShort.hpp
#   components/openmw-mp/Packets/Object/PacketScriptLocalFloat.hpp
#   components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp
#   components/openmw-mp/Packets/Object/PacketScriptMemberShort.hpp
#   components/openmw-mp/Packets/Object/PacketVideoPlay.hpp
This commit is contained in:
David Cernat 2018-05-12 20:35:34 +03:00
commit 672bb707a7
105 changed files with 278 additions and 278 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw-mp/Cell.cpp
View file

@ -202,7 +202,7 @@ void Cell::sendToLoaded(mwmp::ActorPacket *actorPacket, mwmp::BaseActorList *bas
}
}
void Cell::sendToLoaded(mwmp::WorldPacket *worldPacket, mwmp::BaseEvent *baseEvent) const
void Cell::sendToLoaded(mwmp::ObjectPacket *objectPacket, mwmp::BaseEvent *baseEvent) const
{
if (players.empty())
return;
@ -222,10 +222,10 @@ void Cell::sendToLoaded(mwmp::WorldPacket *worldPacket, mwmp::BaseEvent *baseEve
{
if (pl->guid == baseEvent->guid) continue;
worldPacket->setEvent(baseEvent);
objectPacket->setEvent(baseEvent);
// Send the packet to this eligible guid
worldPacket->Send(pl->guid);
objectPacket->Send(pl->guid);
}
}

4
apps/openmw-mp/Cell.hpp
View file

@ -11,7 +11,7 @@
#include <components/openmw-mp/Base/BaseActor.hpp>
#include <components/openmw-mp/Base/BaseEvent.hpp>
#include <components/openmw-mp/Packets/Actor/ActorPacket.hpp>
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
class Player;
class Cell;
@ -41,7 +41,7 @@ public:
TPlayers getPlayers() const;
void sendToLoaded(mwmp::ActorPacket *actorPacket, mwmp::BaseActorList *baseActorList) const;
void sendToLoaded(mwmp::WorldPacket *worldPacket, mwmp::BaseEvent *baseEvent) const;
void sendToLoaded(mwmp::ObjectPacket *objectPacket, mwmp::BaseEvent *baseEvent) const;
std::string getDescription() const;

2
apps/openmw-mp/CellController.hpp
View file

@ -6,7 +6,7 @@
#include <components/esm/records.hpp>
#include <components/openmw-mp/Base/BaseEvent.hpp>
#include <components/openmw-mp/Packets/Actor/ActorPacket.hpp>
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
class Player;
class Cell;

18
apps/openmw-mp/Networking.cpp
View file

@ -43,12 +43,12 @@ Networking::Networking(RakNet::RakPeerInterface *peer) : mclient(nullptr)
playerPacketController = make_unique<PlayerPacketController>(peer);
actorPacketController = make_unique<ActorPacketController>(peer);
worldPacketController = make_unique<WorldPacketController>(peer);
objectPacketController = make_unique<ObjectPacketController>(peer);
// Set send stream
playerPacketController->SetStream(nullptr, &bsOut);
actorPacketController->SetStream(nullptr, &bsOut);
worldPacketController->SetStream(nullptr, &bsOut);
objectPacketController->SetStream(nullptr, &bsOut);
running = true;
exitCode = 0;
@ -171,7 +171,7 @@ void Networking::processActorPacket(RakNet::Packet *packet)
}
void Networking::processWorldPacket(RakNet::Packet *packet)
void Networking::processObjectPacket(RakNet::Packet *packet)
{
auto player = Players::getPlayerByGUID(packet->guid);
@ -179,7 +179,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
return;
if (!WorldProcessor::Process(*packet, baseEvent))
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled WorldPacket with identifier %i has arrived", (int) packet->data[0]);
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled ObjectPacket with identifier %i has arrived", (int) packet->data[0]);
}
@ -264,10 +264,10 @@ bool Networking::update(RakNet::Packet *packet)
actorPacketController->SetStream(&bsIn, nullptr);
processActorPacket(packet);
}
else if (worldPacketController->ContainsPacket(packet->data[0]))
else if (objectPacketController->ContainsPacket(packet->data[0]))
{
worldPacketController->SetStream(&bsIn, nullptr);
processWorldPacket(packet);
objectPacketController->SetStream(&bsIn, nullptr);
processObjectPacket(packet);
}
else
{
@ -343,9 +343,9 @@ ActorPacketController *Networking::getActorPacketController() const
return actorPacketController.get();
}
WorldPacketController *Networking::getWorldPacketController() const
ObjectPacketController *Networking::getObjectPacketController() const
{
return worldPacketController.get();
return objectPacketController.get();
}
BaseActorList *Networking::getLastActorList()

8
apps/openmw-mp/Networking.hpp
View file

@ -7,7 +7,7 @@
#include <components/openmw-mp/Controllers/PlayerPacketController.hpp>
#include <components/openmw-mp/Controllers/ActorPacketController.hpp>
#include <components/openmw-mp/Controllers/WorldPacketController.hpp>
#include <components/openmw-mp/Controllers/ObjectPacketController.hpp>
#include <components/openmw-mp/Packets/PacketPreInit.hpp>
#include <apps/openmw-mp/Script/LuaState.hpp>
@ -38,7 +38,7 @@ namespace mwmp
void processPlayerPacket(RakNet::Packet *packet);
void processActorPacket(RakNet::Packet *packet);
void processWorldPacket(RakNet::Packet *packet);
void processObjectPacket(RakNet::Packet *packet);
bool update(RakNet::Packet *packet);
unsigned short numberOfConnections() const;
@ -51,7 +51,7 @@ namespace mwmp
PlayerPacketController *getPlayerPacketController() const;
ActorPacketController *getActorPacketController() const;
WorldPacketController *getWorldPacketController() const;
ObjectPacketController *getObjectPacketController() const;
LuaState &getState() {return luaState;}
@ -94,7 +94,7 @@ namespace mwmp
std::unique_ptr<PlayerPacketController> playerPacketController;
std::unique_ptr<ActorPacketController> actorPacketController;
std::unique_ptr<WorldPacketController> worldPacketController;
std::unique_ptr<ObjectPacketController> objectPacketController;
bool running;
int exitCode;

8
apps/openmw-mp/Object.cpp
View file

@ -438,7 +438,7 @@ void ObjectController::sendObjects(shared_ptr<Player> player, shared_ptr<vector<
}
}
auto worldCtrl = mwmp::Networking::get().getWorldPacketController();
auto worldCtrl = mwmp::Networking::get().getObjectPacketController();
if (changed[Type::DOOR_STATE])
{
@ -544,7 +544,7 @@ void ObjectController::sendConsoleCommand(shared_ptr<Player> player, shared_ptr<
for (auto &object : *objects)
event.worldObjects.push_back(object->object);
auto packet = mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_CONSOLE_COMMAND);
auto packet = mwmp::Networking::get().getObjectPacketController()->GetPacket(ID_CONSOLE_COMMAND);
packet->setEvent(&event);
packet->Send(false);
@ -568,7 +568,7 @@ void ObjectController::sendContainers(shared_ptr<Player> player, shared_ptr<vect
event.worldObjects.push_back(object->object);
}
auto packet = mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_CONTAINER);
auto packet = mwmp::Networking::get().getObjectPacketController()->GetPacket(ID_CONTAINER);
packet->setEvent(&event);
packet->Send(false);
@ -583,7 +583,7 @@ void ObjectController::requestContainers(shared_ptr<Player> player)
event.guid = player->guid;
event.cell = player->cell;
auto packet = mwmp::Networking::get().getWorldPacketController()->GetPacket(ID_CONTAINER);
auto packet = mwmp::Networking::get().getObjectPacketController()->GetPacket(ID_CONTAINER);
packet->setEvent(&event);
packet->Send(event.guid);
}

4
apps/openmw-mp/processors/WorldProcessor.cpp
View file

@ -10,7 +10,7 @@ using namespace mwmp;
template<class T>
typename BasePacketProcessor<T>::processors_t BasePacketProcessor<T>::processors;
void WorldProcessor::Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event)
void WorldProcessor::Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event)
{
packet.Send(true);
}
@ -27,7 +27,7 @@ bool WorldProcessor::Process(RakNet::Packet &packet, BaseEvent &event) noexcept
if (processor.first == packet.data[0])
{
auto player = Players::getPlayerByGUID(packet.guid);
WorldPacket *myPacket = Networking::get().getWorldPacketController()->GetPacket(packet.data[0]);
ObjectPacket *myPacket = Networking::get().getObjectPacketController()->GetPacket(packet.data[0]);
myPacket->setEvent(&event);
event.isValid = true;

4
apps/openmw-mp/processors/WorldProcessor.hpp
View file

@ -8,7 +8,7 @@
#include <components/openmw-mp/Base/BasePacketProcessor.hpp>
#include <components/openmw-mp/Packets/BasePacket.hpp>
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
#include <components/openmw-mp/NetworkMessages.hpp>
#include "Players.hpp"
@ -18,7 +18,7 @@ namespace mwmp
{
public:
virtual void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event);
virtual void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event);
static bool Process(RakNet::Packet &packet, BaseEvent &event) noexcept;
};

2
apps/openmw-mp/processors/world/ProcessorContainer.hpp
View file

@ -15,7 +15,7 @@ namespace mwmp
BPP_INIT(ID_CONTAINER)
}
void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());
LOG_APPEND(Log::LOG_INFO, "- action: %i", (int) event.action);

2
apps/openmw-mp/processors/world/ProcessorDoorState.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_DOOR_STATE)
}
void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
{
packet.Send(true);

2
apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_DELETE)
}
void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());

2
apps/openmw-mp/processors/world/ProcessorObjectLock.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_LOCK)
}
void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());

2
apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp
View file

@ -14,7 +14,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_PLACE)
}
void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());

2
apps/openmw-mp/processors/world/ProcessorObjectScale.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_SCALE)
}
void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());

2
apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp
View file

@ -14,7 +14,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_SPAWN)
}
void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());

2
apps/openmw-mp/processors/world/ProcessorObjectState.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_STATE)
}
void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());

2
apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_TRAP)
}
void Do(WorldPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
void Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseEvent &event) override
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());

12
apps/openmw/mwgui/container.cpp
View file

@ -124,8 +124,8 @@ namespace MWGui
worldEvent->addContainerItem(worldObject, itemPtr, count);
worldEvent->worldObjects.push_back(std::move(worldObject));
mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->setEvent(worldEvent);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_CONTAINER)->setEvent(worldEvent);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_CONTAINER)->Send();
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_CONTAINER about\n- Ptr cellRef: %s, %i\n- cell: %s\n- item: %s, %i",
worldObject.refId.c_str(), worldObject.refNumIndex, worldEvent->cell.getDescription().c_str(),
@ -179,8 +179,8 @@ namespace MWGui
worldObject.containerItems.push_back(std::move(containerItem));
worldEvent->worldObjects.push_back(std::move(worldObject));
mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->setEvent(worldEvent);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_CONTAINER)->setEvent(worldEvent);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_CONTAINER)->Send();
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_CONTAINER about\n- Ptr cellRef: %s, %i\n- cell: %s\n- item: %s, %i, %i",
worldObject.refId.c_str(), worldObject.refNumIndex, worldEvent->cell.getDescription().c_str(),
@ -306,8 +306,8 @@ namespace MWGui
worldEvent->containerSubAction = mwmp::BaseEvent::ContainerSubAction::TakeAll;
worldEvent->addEntireContainer(mPtr);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->setEvent(worldEvent);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_CONTAINER)->setEvent(worldEvent);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_CONTAINER)->Send();
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_CONTAINER about\n- Ptr cellRef: %s, %i-%i\n- cell: %s",
mPtr.getCellRef().getRefId().c_str(), mPtr.getCellRef().getRefNum().mIndex, mPtr.getCellRef().getMpNum(),

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

@ -198,7 +198,7 @@ string listComparison(PacketPreInit::PluginContainer checksums, PacketPreInit::P
}
Networking::Networking(): peer(RakNet::RakPeerInterface::GetInstance()), playerPacketController(peer),
actorPacketController(peer), worldPacketController(peer)
actorPacketController(peer), objectPacketController(peer)
{
RakNet::SocketDescriptor sd;
@ -208,7 +208,7 @@ Networking::Networking(): peer(RakNet::RakPeerInterface::GetInstance()), playerP
playerPacketController.SetStream(0, &bsOut);
actorPacketController.SetStream(0, &bsOut);
worldPacketController.SetStream(0, &bsOut);
objectPacketController.SetStream(0, &bsOut);
connected = 0;
ProcessorInitializer();
@ -430,10 +430,10 @@ void Networking::receiveMessage(RakNet::Packet *packet)
if (!ActorProcessor::Process(*packet, actorList))
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled ActorPacket with identifier %i has arrived", (int) packet->data[0]);
}
else if (worldPacketController.ContainsPacket(packet->data[0]))
else if (objectPacketController.ContainsPacket(packet->data[0]))
{
if (!WorldProcessor::Process(*packet, worldEvent))
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled WorldPacket with identifier %i has arrived", (int) packet->data[0]);
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled ObjectPacket with identifier %i has arrived", (int) packet->data[0]);
}
}
@ -447,9 +447,9 @@ ActorPacket *Networking::getActorPacket(RakNet::MessageID id)
return actorPacketController.GetPacket(id);
}
WorldPacket *Networking::getWorldPacket(RakNet::MessageID id)
ObjectPacket *Networking::getObjectPacket(RakNet::MessageID id)
{
return worldPacketController.GetPacket(id);
return objectPacketController.GetPacket(id);
}
LocalPlayer *Networking::getLocalPlayer()

6
apps/openmw/mwmp/Networking.hpp
View file

@ -15,7 +15,7 @@
#include <components/openmw-mp/Controllers/PlayerPacketController.hpp>
#include <components/openmw-mp/Controllers/ActorPacketController.hpp>
#include <components/openmw-mp/Controllers/WorldPacketController.hpp>
#include <components/openmw-mp/Controllers/ObjectPacketController.hpp>
#include <components/files/collections.hpp>
@ -33,7 +33,7 @@ namespace mwmp
PlayerPacket *getPlayerPacket(RakNet::MessageID id);
ActorPacket *getActorPacket(RakNet::MessageID id);
WorldPacket *getWorldPacket(RakNet::MessageID id);
ObjectPacket *getObjectPacket(RakNet::MessageID id);
RakNet::SystemAddress serverAddress()
{
@ -56,7 +56,7 @@ namespace mwmp
PlayerPacketController playerPacketController;
ActorPacketController actorPacketController;
WorldPacketController worldPacketController;
ObjectPacketController objectPacketController;
ActorList actorList;
WorldEvent worldEvent;

64
apps/openmw/mwmp/WorldEvent.cpp
View file

@ -1025,8 +1025,8 @@ void WorldEvent::sendObjectPlace()
for (const auto &worldObject : worldObjects)
LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, count: %i", worldObject.refId.c_str(), worldObject.count);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_PLACE)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_PLACE)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_PLACE)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_PLACE)->Send();
}
void WorldEvent::sendObjectSpawn()
@ -1039,44 +1039,44 @@ void WorldEvent::sendObjectSpawn()
for (const auto &worldObject : worldObjects)
LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s-%i", worldObject.refId.c_str(), worldObject.refNumIndex);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_SPAWN)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_SPAWN)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_SPAWN)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_SPAWN)->Send();
}
void WorldEvent::sendObjectDelete()
{
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_DELETE)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_DELETE)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_DELETE)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_DELETE)->Send();
}
void WorldEvent::sendObjectLock()
{
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_LOCK)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_LOCK)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_LOCK)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_LOCK)->Send();
}
void WorldEvent::sendObjectTrap()
{
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_TRAP)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_TRAP)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_TRAP)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_TRAP)->Send();
}
void WorldEvent::sendObjectScale()
{
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_SCALE)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_SCALE)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_SCALE)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_SCALE)->Send();
}
void WorldEvent::sendObjectState()
{
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_STATE)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_STATE)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_STATE)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_STATE)->Send();
}
void WorldEvent::sendObjectAnimPlay()
{
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_ANIM_PLAY)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_ANIM_PLAY)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_ANIM_PLAY)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_OBJECT_ANIM_PLAY)->Send();
}
void WorldEvent::sendDoorState()
@ -1087,20 +1087,20 @@ void WorldEvent::sendDoorState()
LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s-%i, state: %s", worldObject.refId.c_str(), worldObject.refNumIndex,
worldObject.doorState ? "true" : "false");
mwmp::Main::get().getNetworking()->getWorldPacket(ID_DOOR_STATE)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_DOOR_STATE)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_DOOR_STATE)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_DOOR_STATE)->Send();
}
void WorldEvent::sendMusicPlay()
{
mwmp::Main::get().getNetworking()->getWorldPacket(ID_MUSIC_PLAY)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_MUSIC_PLAY)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_MUSIC_PLAY)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_MUSIC_PLAY)->Send();
}
void WorldEvent::sendVideoPlay()
{
mwmp::Main::get().getNetworking()->getWorldPacket(ID_VIDEO_PLAY)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_VIDEO_PLAY)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_VIDEO_PLAY)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_VIDEO_PLAY)->Send();
}
void WorldEvent::sendScriptLocalShort()
@ -1111,8 +1111,8 @@ void WorldEvent::sendScriptLocalShort()
LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s-%i, index: %i, shortVal: %i", worldObject.refId.c_str(),
worldObject.refNumIndex, worldObject.index, worldObject.shortVal);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_LOCAL_SHORT)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_LOCAL_SHORT)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_LOCAL_SHORT)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_LOCAL_SHORT)->Send();
}
void WorldEvent::sendScriptLocalFloat()
@ -1123,8 +1123,8 @@ void WorldEvent::sendScriptLocalFloat()
LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s-%i, index: %i, floatVal: %f", worldObject.refId.c_str(),
worldObject.refNumIndex, worldObject.index, worldObject.floatVal);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_LOCAL_FLOAT)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_LOCAL_FLOAT)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_LOCAL_FLOAT)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_LOCAL_FLOAT)->Send();
}
void WorldEvent::sendScriptMemberShort()
@ -1135,8 +1135,8 @@ void WorldEvent::sendScriptMemberShort()
LOG_APPEND(Log::LOG_VERBOSE, "- cellRef: %s, index: %i, shortVal: %i", worldObject.refId.c_str(),
worldObject.index, worldObject.shortVal);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_MEMBER_SHORT)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_MEMBER_SHORT)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_MEMBER_SHORT)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_MEMBER_SHORT)->Send();
}
void WorldEvent::sendScriptGlobalShort()
@ -1146,14 +1146,14 @@ void WorldEvent::sendScriptGlobalShort()
for (const auto &worldObject : worldObjects)
LOG_APPEND(Log::LOG_VERBOSE, "- varName: %s, shortVal: %i", worldObject.varName.c_str(), worldObject.shortVal);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_GLOBAL_SHORT)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_SCRIPT_GLOBAL_SHORT)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_GLOBAL_SHORT)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_GLOBAL_SHORT)->Send();
}
void WorldEvent::sendContainer()
{
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Sending ID_CONTAINER");
mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->setEvent(this);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_CONTAINER)->Send();
mwmp::Main::get().getNetworking()->getObjectPacket(ID_CONTAINER)->setEvent(this);
mwmp::Main::get().getNetworking()->getObjectPacket(ID_CONTAINER)->Send();
}

2
apps/openmw/mwmp/processors/WorldProcessor.cpp
View file

@ -17,7 +17,7 @@ bool WorldProcessor::Process(RakNet::Packet &packet, WorldEvent &event)
bsIn.Read(guid);
event.guid = guid;
WorldPacket *myPacket = Main::get().getNetworking()->getWorldPacket(packet.data[0]);
ObjectPacket *myPacket = Main::get().getNetworking()->getObjectPacket(packet.data[0]);
myPacket->setEvent(&event);
myPacket->SetReadStream(&bsIn);

4
apps/openmw/mwmp/processors/WorldProcessor.hpp
View file

@ -7,7 +7,7 @@
#include <components/openmw-mp/Log.hpp>
#include <components/openmw-mp/NetworkMessages.hpp>
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
#include "../WorldEvent.hpp"
#include "../LocalPlayer.hpp"
#include "../DedicatedPlayer.hpp"
@ -18,7 +18,7 @@ namespace mwmp
class WorldProcessor : public BasePacketProcessor<WorldProcessor>, public BaseClientPacketProcessor
{
public:
virtual void Do(WorldPacket &packet, WorldEvent &event) = 0;
virtual void Do(ObjectPacket &packet, WorldEvent &event) = 0;
static bool Process(RakNet::Packet &packet, WorldEvent &event);
};

2
apps/openmw/mwmp/processors/world/BaseObjectProcessor.hpp
View file

@ -15,7 +15,7 @@ namespace mwmp
class BaseObjectProcessor: public WorldProcessor
{
public:
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
ptrCellStore = Main::get().getCellController()->getCellStore(event.cell);

2
apps/openmw/mwmp/processors/world/ProcessorConsoleCommand.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_CONSOLE_COMMAND)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_CONTAINER)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorDoorDestination.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_DOOR_DESTINATION)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorDoorState.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_DOOR_STATE)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorMusicPlay.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_MUSIC_PLAY)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received %s", strPacketID.c_str());
event.playMusic();

2
apps/openmw/mwmp/processors/world/ProcessorObjectAnimPlay.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_ANIM_PLAY)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectAttach.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_ATTACH)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectCollision.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_COLLISION)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectDelete.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_DELETE)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectLock.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_LOCK)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectMove.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_MOVE)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectPlace.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_PLACE)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectReset.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_RESET)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectRotate.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_ROTATE)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectScale.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_SCALE)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectSpawn.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_SPAWN)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectState.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_STATE)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorObjectTrap.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_OBJECT_TRAP)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorScriptGlobalFloat.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_SCRIPT_GLOBAL_FLOAT)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received %s", strPacketID.c_str());
//event.setGlobalFloats();

2
apps/openmw/mwmp/processors/world/ProcessorScriptGlobalShort.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_SCRIPT_GLOBAL_SHORT)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received %s", strPacketID.c_str());
event.setGlobalShorts();

2
apps/openmw/mwmp/processors/world/ProcessorScriptLocalFloat.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_SCRIPT_LOCAL_FLOAT)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorScriptLocalShort.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_SCRIPT_LOCAL_SHORT)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
BaseObjectProcessor::Do(packet, event);

2
apps/openmw/mwmp/processors/world/ProcessorScriptMemberFloat.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_SCRIPT_MEMBER_FLOAT)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received %s", strPacketID.c_str());
//event.setMemberFloats();

2
apps/openmw/mwmp/processors/world/ProcessorScriptMemberShort.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_SCRIPT_MEMBER_SHORT)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received %s", strPacketID.c_str());
event.setMemberShorts();

2
apps/openmw/mwmp/processors/world/ProcessorVideoPlay.hpp
View file

@ -13,7 +13,7 @@ namespace mwmp
BPP_INIT(ID_VIDEO_PLAY)
}
virtual void Do(WorldPacket &packet, WorldEvent &event)
virtual void Do(ObjectPacket &packet, WorldEvent &event)
{
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Received %s", strPacketID.c_str());
event.playVideo();

6
components/CMakeLists.txt
View file

@ -154,7 +154,7 @@ add_component_dir (openmw-mp/Base
)
add_component_dir (openmw-mp/Controllers
PlayerPacketController ActorPacketController WorldPacketController PacketController
PlayerPacketController ActorPacketController ObjectPacketController PacketController
)
add_component_dir(openmw-mp/Master
@ -188,8 +188,8 @@ add_component_dir (openmw-mp/Packets/Player
PacketPlayerResurrect PacketPlayerShapeshift PacketPlayerSkill PacketPlayerSpeech PacketPlayerSpellbook PacketPlayerStatsDynamic PacketPlayerTopic
)
add_component_dir (openmw-mp/Packets/World
WorldPacket
add_component_dir (openmw-mp/Packets/Object
ObjectPacket
PacketConsoleCommand PacketContainer PacketObjectAnimPlay PacketObjectAttach PacketObjectCollision
PacketObjectDelete PacketDoorDestination PacketDoorState PacketObjectLock PacketObjectMove PacketObjectPlace
PacketObjectReset PacketObjectRotate PacketObjectScale PacketObjectSpawn PacketObjectState PacketObjectTrap

60
components/openmw-mp/Controllers/ObjectPacketController.cpp Normal file
View file

@ -0,0 +1,60 @@
#include "../Packets/Object/PacketObjectAnimPlay.hpp"
#include "../Packets/Object/PacketObjectAttach.hpp"
#include "../Packets/Object/PacketObjectCollision.hpp"
#include "../Packets/Object/PacketObjectDelete.hpp"
#include "../Packets/Object/PacketObjectLock.hpp"
#include "../Packets/Object/PacketObjectMove.hpp"
#include "../Packets/Object/PacketObjectPlace.hpp"
#include "../Packets/Object/PacketObjectReset.hpp"
#include "../Packets/Object/PacketObjectRotate.hpp"
#include "../Packets/Object/PacketObjectScale.hpp"
#include "../Packets/Object/PacketObjectSpawn.hpp"
#include "../Packets/Object/PacketObjectState.hpp"
#include "../Packets/Object/PacketObjectTrap.hpp"
#include "../Packets/Object/PacketContainer.hpp"
#include "../Packets/Object/PacketDoorDestination.hpp"
#include "../Packets/Object/PacketDoorState.hpp"
#include "../Packets/Object/PacketMusicPlay.hpp"
#include "../Packets/Object/PacketVideoPlay.hpp"
#include "../Packets/Object/PacketConsoleCommand.hpp"
#include "../Packets/Object/PacketScriptLocalShort.hpp"
#include "../Packets/Object/PacketScriptLocalFloat.hpp"
#include "../Packets/Object/PacketScriptMemberShort.hpp"
#include "../Packets/Object/PacketScriptMemberFloat.hpp"
#include "../Packets/Object/PacketScriptGlobalShort.hpp"
#include "../Packets/Object/PacketScriptGlobalFloat.hpp"
#include "ObjectPacketController.hpp"
mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *peer)
{
AddPacket<PacketObjectAnimPlay>(&packets, peer);
AddPacket<PacketObjectAttach>(&packets, peer);
AddPacket<PacketObjectCollision>(&packets, peer);
AddPacket<PacketObjectDelete>(&packets, peer);
AddPacket<PacketObjectLock>(&packets, peer);
AddPacket<PacketObjectMove>(&packets, peer);
AddPacket<PacketObjectPlace>(&packets, peer);
AddPacket<PacketObjectReset>(&packets, peer);
AddPacket<PacketObjectRotate>(&packets, peer);
AddPacket<PacketObjectScale>(&packets, peer);
AddPacket<PacketObjectSpawn>(&packets, peer);
AddPacket<PacketObjectState>(&packets, peer);
AddPacket<PacketObjectTrap>(&packets, peer);
AddPacket<PacketContainer>(&packets, peer);
AddPacket<PacketDoorDestination>(&packets, peer);
AddPacket<PacketDoorState>(&packets, peer);
AddPacket<PacketMusicPlay>(&packets, peer);
AddPacket<PacketVideoPlay>(&packets, peer);
AddPacket<PacketConsoleCommand>(&packets, peer);
AddPacket<PacketScriptLocalShort>(&packets, peer);
AddPacket<PacketScriptLocalFloat>(&packets, peer);
AddPacket<PacketScriptMemberShort>(&packets, peer);
AddPacket<PacketScriptMemberFloat>(&packets, peer);
AddPacket<PacketScriptGlobalShort>(&packets, peer);
AddPacket<PacketScriptGlobalFloat>(&packets, peer);
}

6
components/openmw-mp/Controllers/WorldPacketController.hpp → components/openmw-mp/Controllers/ObjectPacketController.hpp
View file

@ -2,15 +2,15 @@
#define OPENMW_WORLDPACKETCONTROLLER_HPP
#include "../Packets/World/WorldPacket.hpp"
#include "../Packets/Object/ObjectPacket.hpp"
#include "BasePacketController.hpp"
namespace mwmp
{
class WorldPacketController: public BasePacketController<WorldPacket>
class ObjectPacketController: public BasePacketController<ObjectPacket>
{
public:
WorldPacketController(RakNet::RakPeerInterface *peer);
ObjectPacketController(RakNet::RakPeerInterface *peer);
};
}

60
components/openmw-mp/Controllers/WorldPacketController.cpp
View file

@ -1,60 +0,0 @@
#include "../Packets/World/PacketObjectAnimPlay.hpp"
#include "../Packets/World/PacketObjectAttach.hpp"
#include "../Packets/World/PacketObjectCollision.hpp"
#include "../Packets/World/PacketObjectDelete.hpp"
#include "../Packets/World/PacketObjectLock.hpp"
#include "../Packets/World/PacketObjectMove.hpp"
#include "../Packets/World/PacketObjectPlace.hpp"
#include "../Packets/World/PacketObjectReset.hpp"
#include "../Packets/World/PacketObjectRotate.hpp"
#include "../Packets/World/PacketObjectScale.hpp"
#include "../Packets/World/PacketObjectSpawn.hpp"
#include "../Packets/World/PacketObjectState.hpp"
#include "../Packets/World/PacketObjectTrap.hpp"
#include "../Packets/World/PacketContainer.hpp"
#include "../Packets/World/PacketDoorDestination.hpp"
#include "../Packets/World/PacketDoorState.hpp"
#include "../Packets/World/PacketMusicPlay.hpp"
#include "../Packets/World/PacketVideoPlay.hpp"
#include "../Packets/World/PacketConsoleCommand.hpp"
#include "../Packets/World/PacketScriptLocalShort.hpp"
#include "../Packets/World/PacketScriptLocalFloat.hpp"
#include "../Packets/World/PacketScriptMemberShort.hpp"
#include "../Packets/World/PacketScriptMemberFloat.hpp"
#include "../Packets/World/PacketScriptGlobalShort.hpp"
#include "../Packets/World/PacketScriptGlobalFloat.hpp"
#include "WorldPacketController.hpp"
mwmp::WorldPacketController::WorldPacketController(RakNet::RakPeerInterface *peer)
{
AddPacket<PacketObjectAnimPlay>(&packets, peer);
AddPacket<PacketObjectAttach>(&packets, peer);
AddPacket<PacketObjectCollision>(&packets, peer);
AddPacket<PacketObjectDelete>(&packets, peer);
AddPacket<PacketObjectLock>(&packets, peer);
AddPacket<PacketObjectMove>(&packets, peer);
AddPacket<PacketObjectPlace>(&packets, peer);
AddPacket<PacketObjectReset>(&packets, peer);
AddPacket<PacketObjectRotate>(&packets, peer);
AddPacket<PacketObjectScale>(&packets, peer);
AddPacket<PacketObjectSpawn>(&packets, peer);
AddPacket<PacketObjectState>(&packets, peer);
AddPacket<PacketObjectTrap>(&packets, peer);
AddPacket<PacketContainer>(&packets, peer);
AddPacket<PacketDoorDestination>(&packets, peer);
AddPacket<PacketDoorState>(&packets, peer);
AddPacket<PacketMusicPlay>(&packets, peer);
AddPacket<PacketVideoPlay>(&packets, peer);
AddPacket<PacketConsoleCommand>(&packets, peer);
AddPacket<PacketScriptLocalShort>(&packets, peer);
AddPacket<PacketScriptLocalFloat>(&packets, peer);
AddPacket<PacketScriptMemberShort>(&packets, peer);
AddPacket<PacketScriptMemberFloat>(&packets, peer);
AddPacket<PacketScriptGlobalShort>(&packets, peer);
AddPacket<PacketScriptGlobalFloat>(&packets, peer);
}

12
components/openmw-mp/Packets/World/WorldPacket.cpp → components/openmw-mp/Packets/Object/ObjectPacket.cpp
View file

@ -1,11 +1,11 @@
#include <components/openmw-mp/NetworkMessages.hpp>
#include <PacketPriority.h>
#include <RakPeer.h>
#include "WorldPacket.hpp"
#include "ObjectPacket.hpp"
using namespace mwmp;
WorldPacket::WorldPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
ObjectPacket::ObjectPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
{
hasCellData = false;
packetID = 0;
@ -15,13 +15,13 @@ WorldPacket::WorldPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
this->peer = peer;
}
void WorldPacket::setEvent(BaseEvent *event)
void ObjectPacket::setEvent(BaseEvent *event)
{
this->event = event;
guid = event->guid;
}
void WorldPacket::Packet(RakNet::BitStream *bs, bool send)
void ObjectPacket::Packet(RakNet::BitStream *bs, bool send)
{
if (!PacketHeader(bs, send))
return;
@ -32,7 +32,7 @@ void WorldPacket::Packet(RakNet::BitStream *bs, bool send)
}
}
bool WorldPacket::PacketHeader(RakNet::BitStream *bs, bool send)
bool ObjectPacket::PacketHeader(RakNet::BitStream *bs, bool send)
{
BasePacket::Packet(bs, send);
@ -64,7 +64,7 @@ bool WorldPacket::PacketHeader(RakNet::BitStream *bs, bool send)
return true;
}
void WorldPacket::Object(WorldObject &worldObject, bool send)
void ObjectPacket::Object(WorldObject &worldObject, bool send)
{
RW(worldObject.refId, send);
RW(worldObject.refNumIndex, send);

6
components/openmw-mp/Packets/World/WorldPacket.hpp → components/openmw-mp/Packets/Object/ObjectPacket.hpp
View file

@ -12,12 +12,12 @@
namespace mwmp
{
class WorldPacket: public BasePacket
class ObjectPacket: public BasePacket
{
public:
explicit WorldPacket(RakNet::RakPeerInterface *peer);
explicit ObjectPacket(RakNet::RakPeerInterface *peer);
~WorldPacket() override = default;
~ObjectPacket() override = default;
void setEvent(BaseEvent *event);

2
components/openmw-mp/Packets/World/PacketConsoleCommand.cpp → components/openmw-mp/Packets/Object/PacketConsoleCommand.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketConsoleCommand::PacketConsoleCommand(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketConsoleCommand::PacketConsoleCommand(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_CONSOLE_COMMAND;
}

4
components/openmw-mp/Packets/World/PacketConsoleCommand.hpp → components/openmw-mp/Packets/Object/PacketConsoleCommand.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETCONSOLECOMMAND_HPP
#define OPENMW_PACKETCONSOLECOMMAND_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketConsoleCommand final: public WorldPacket
class PacketConsoleCommand final: public ObjectPacket
{
public:
explicit PacketConsoleCommand(RakNet::RakPeerInterface *peer);

2
components/openmw-mp/Packets/World/PacketContainer.cpp → components/openmw-mp/Packets/Object/PacketContainer.cpp
View file

@ -4,7 +4,7 @@
using namespace mwmp;
PacketContainer::PacketContainer(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketContainer::PacketContainer(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_CONTAINER;
hasCellData = true;

4
components/openmw-mp/Packets/World/PacketContainer.hpp → components/openmw-mp/Packets/Object/PacketContainer.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETCONTAINER_HPP
#define OPENMW_PACKETCONTAINER_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketContainer final: public WorldPacket
class PacketContainer final: public ObjectPacket
{
public:
explicit PacketContainer(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketDoorDestination.cpp → components/openmw-mp/Packets/Object/PacketDoorDestination.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketDoorDestination::PacketDoorDestination(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketDoorDestination::PacketDoorDestination(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_DOOR_DESTINATION;
hasCellData = true;
@ -11,7 +11,7 @@ PacketDoorDestination::PacketDoorDestination(RakNet::RakPeerInterface *peer) : W
void PacketDoorDestination::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.teleportState, send);

4
components/openmw-mp/Packets/World/PacketDoorDestination.hpp → components/openmw-mp/Packets/Object/PacketDoorDestination.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETDOORDESTINATION_HPP
#define OPENMW_PACKETDOORDESTINATION_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketDoorDestination : public WorldPacket
class PacketDoorDestination : public ObjectPacket
{
public:
PacketDoorDestination(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketDoorState.cpp → components/openmw-mp/Packets/Object/PacketDoorState.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketDoorState::PacketDoorState(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketDoorState::PacketDoorState(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_DOOR_STATE;
hasCellData = true;
@ -11,6 +11,6 @@ PacketDoorState::PacketDoorState(RakNet::RakPeerInterface *peer) : WorldPacket(p
void PacketDoorState::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.doorState, send);
}

4
components/openmw-mp/Packets/World/PacketDoorState.hpp → components/openmw-mp/Packets/Object/PacketDoorState.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETDOORSTATE_HPP
#define OPENMW_PACKETDOORSTATE_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketDoorState final: public WorldPacket
class PacketDoorState final: public ObjectPacket
{
public:
explicit PacketDoorState(RakNet::RakPeerInterface *peer);

2
components/openmw-mp/Packets/World/PacketMusicPlay.cpp → components/openmw-mp/Packets/Object/PacketMusicPlay.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketMusicPlay::PacketMusicPlay(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketMusicPlay::PacketMusicPlay(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_MUSIC_PLAY;
}

4
components/openmw-mp/Packets/World/PacketMusicPlay.hpp → components/openmw-mp/Packets/Object/PacketMusicPlay.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETMUSICPLAY_HPP
#define OPENMW_PACKETMUSICPLAY_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketMusicPlay final: public WorldPacket
class PacketMusicPlay final: public ObjectPacket
{
public:
explicit PacketMusicPlay(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectAnimPlay.cpp → components/openmw-mp/Packets/Object/PacketObjectAnimPlay.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectAnimPlay::PacketObjectAnimPlay(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectAnimPlay::PacketObjectAnimPlay(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_ANIM_PLAY;
hasCellData = true;
@ -11,7 +11,7 @@ PacketObjectAnimPlay::PacketObjectAnimPlay(RakNet::RakPeerInterface *peer) : Wor
void PacketObjectAnimPlay::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.animGroup, send);
RW(worldObject.animMode, send);
}

4
components/openmw-mp/Packets/World/PacketObjectAnimPlay.hpp → components/openmw-mp/Packets/Object/PacketObjectAnimPlay.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTANIMPLAY_HPP
#define OPENMW_PACKETOBJECTANIMPLAY_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectAnimPlay final: public WorldPacket
class PacketObjectAnimPlay final: public ObjectPacket
{
public:
explicit PacketObjectAnimPlay(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectAttach.cpp → components/openmw-mp/Packets/Object/PacketObjectAttach.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectAttach::PacketObjectAttach(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectAttach::PacketObjectAttach(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_ATTACH;
hasCellData = true;
@ -11,6 +11,6 @@ PacketObjectAttach::PacketObjectAttach(RakNet::RakPeerInterface *peer) : WorldPa
void PacketObjectAttach::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
// Placeholder
}

4
components/openmw-mp/Packets/World/PacketObjectAttach.hpp → components/openmw-mp/Packets/Object/PacketObjectAttach.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTATTACH_HPP
#define OPENMW_PACKETOBJECTATTACH_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectAttach : public WorldPacket
class PacketObjectAttach : public ObjectPacket
{
public:
PacketObjectAttach(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectCollision.cpp → components/openmw-mp/Packets/Object/PacketObjectCollision.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectCollision::PacketObjectCollision(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectCollision::PacketObjectCollision(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_COLLISION;
hasCellData = true;
@ -11,6 +11,6 @@ PacketObjectCollision::PacketObjectCollision(RakNet::RakPeerInterface *peer) : W
void PacketObjectCollision::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
// Placeholder
}

4
components/openmw-mp/Packets/World/PacketObjectCollision.hpp → components/openmw-mp/Packets/Object/PacketObjectCollision.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTCOLLISION_HPP
#define OPENMW_PACKETOBJECTCOLLISION_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectCollision : public WorldPacket
class PacketObjectCollision : public ObjectPacket
{
public:
PacketObjectCollision(RakNet::RakPeerInterface *peer);

2
components/openmw-mp/Packets/World/PacketObjectDelete.cpp → components/openmw-mp/Packets/Object/PacketObjectDelete.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectDelete::PacketObjectDelete(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectDelete::PacketObjectDelete(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_DELETE;
hasCellData = true;

4
components/openmw-mp/Packets/World/PacketObjectDelete.hpp → components/openmw-mp/Packets/Object/PacketObjectDelete.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTDELETE_HPP
#define OPENMW_PACKETOBJECTDELETE_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectDelete final: public WorldPacket
class PacketObjectDelete final: public ObjectPacket
{
public:
explicit PacketObjectDelete(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectLock.cpp → components/openmw-mp/Packets/Object/PacketObjectLock.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectLock::PacketObjectLock(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectLock::PacketObjectLock(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_LOCK;
hasCellData = true;
@ -11,6 +11,6 @@ PacketObjectLock::PacketObjectLock(RakNet::RakPeerInterface *peer) : WorldPacket
void PacketObjectLock::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.lockLevel, send);
}

4
components/openmw-mp/Packets/World/PacketObjectLock.hpp → components/openmw-mp/Packets/Object/PacketObjectLock.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTLOCK_HPP
#define OPENMW_PACKETOBJECTLOCK_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectLock final: public WorldPacket
class PacketObjectLock final: public ObjectPacket
{
public:
explicit PacketObjectLock(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectMove.cpp → components/openmw-mp/Packets/Object/PacketObjectMove.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectMove::PacketObjectMove(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectMove::PacketObjectMove(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_MOVE;
hasCellData = true;
@ -11,6 +11,6 @@ PacketObjectMove::PacketObjectMove(RakNet::RakPeerInterface *peer) : WorldPacket
void PacketObjectMove::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.position.pos, send);
}

4
components/openmw-mp/Packets/World/PacketObjectMove.hpp → components/openmw-mp/Packets/Object/PacketObjectMove.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PacketObjectMove_HPP
#define OPENMW_PacketObjectMove_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectMove final: public WorldPacket
class PacketObjectMove final: public ObjectPacket
{
public:
explicit PacketObjectMove(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectPlace.cpp → components/openmw-mp/Packets/Object/PacketObjectPlace.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectPlace::PacketObjectPlace(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectPlace::PacketObjectPlace(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_PLACE;
hasCellData = true;
@ -11,7 +11,7 @@ PacketObjectPlace::PacketObjectPlace(RakNet::RakPeerInterface *peer) : WorldPack
void PacketObjectPlace::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.count, send);
RW(worldObject.charge, send);
RW(worldObject.enchantmentCharge, send);

4
components/openmw-mp/Packets/World/PacketObjectPlace.hpp → components/openmw-mp/Packets/Object/PacketObjectPlace.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTPLACE_HPP
#define OPENMW_PACKETOBJECTPLACE_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectPlace final: public WorldPacket
class PacketObjectPlace final: public ObjectPacket
{
public:
explicit PacketObjectPlace(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectReset.cpp → components/openmw-mp/Packets/Object/PacketObjectReset.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectReset::PacketObjectReset(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectReset::PacketObjectReset(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_RESET;
hasCellData = true;
@ -11,6 +11,6 @@ PacketObjectReset::PacketObjectReset(RakNet::RakPeerInterface *peer) : WorldPack
void PacketObjectReset::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
// Placeholder
}

4
components/openmw-mp/Packets/World/PacketObjectReset.hpp → components/openmw-mp/Packets/Object/PacketObjectReset.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTRESET_HPP
#define OPENMW_PACKETOBJECTRESET_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectReset : public WorldPacket
class PacketObjectReset : public ObjectPacket
{
public:
PacketObjectReset(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectRotate.cpp → components/openmw-mp/Packets/Object/PacketObjectRotate.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectRotate::PacketObjectRotate(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectRotate::PacketObjectRotate(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_ROTATE;
hasCellData = true;
@ -11,7 +11,7 @@ PacketObjectRotate::PacketObjectRotate(RakNet::RakPeerInterface *peer) : WorldPa
void PacketObjectRotate::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.position.rot[0], send);
RW(worldObject.position.rot[1], send);
RW(worldObject.position.rot[2], send);

4
components/openmw-mp/Packets/World/PacketObjectRotate.hpp → components/openmw-mp/Packets/Object/PacketObjectRotate.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTROTATE_HPP
#define OPENMW_PACKETOBJECTROTATE_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectRotate final: public WorldPacket
class PacketObjectRotate final: public ObjectPacket
{
public:
explicit PacketObjectRotate(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectScale.cpp → components/openmw-mp/Packets/Object/PacketObjectScale.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectScale::PacketObjectScale(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectScale::PacketObjectScale(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_SCALE;
hasCellData = true;
@ -11,6 +11,6 @@ PacketObjectScale::PacketObjectScale(RakNet::RakPeerInterface *peer) : WorldPack
void PacketObjectScale::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.scale, send);
}

4
components/openmw-mp/Packets/World/PacketObjectScale.hpp → components/openmw-mp/Packets/Object/PacketObjectScale.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTSCALE_HPP
#define OPENMW_PACKETOBJECTSCALE_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectScale final: public WorldPacket
class PacketObjectScale final: public ObjectPacket
{
public:
explicit PacketObjectScale(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectSpawn.cpp → components/openmw-mp/Packets/Object/PacketObjectSpawn.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectSpawn::PacketObjectSpawn(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectSpawn::PacketObjectSpawn(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_SPAWN;
hasCellData = true;
@ -11,7 +11,7 @@ PacketObjectSpawn::PacketObjectSpawn(RakNet::RakPeerInterface *peer) : WorldPack
void PacketObjectSpawn::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.position, send);
RW(worldObject.hasMaster, send);

4
components/openmw-mp/Packets/World/PacketObjectSpawn.hpp → components/openmw-mp/Packets/Object/PacketObjectSpawn.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTSPAWN_HPP
#define OPENMW_PACKETOBJECTSPAWN_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectSpawn final: public WorldPacket
class PacketObjectSpawn final: public ObjectPacket
{
public:
explicit PacketObjectSpawn(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectState.cpp → components/openmw-mp/Packets/Object/PacketObjectState.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectState::PacketObjectState(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectState::PacketObjectState(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_STATE;
hasCellData = true;
@ -11,6 +11,6 @@ PacketObjectState::PacketObjectState(RakNet::RakPeerInterface *peer) : WorldPack
void PacketObjectState::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.objectState, send);
}

4
components/openmw-mp/Packets/World/PacketObjectState.hpp → components/openmw-mp/Packets/Object/PacketObjectState.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTSTATE_HPP
#define OPENMW_PACKETOBJECTSTATE_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectState final: public WorldPacket
class PacketObjectState final: public ObjectPacket
{
public:
explicit PacketObjectState(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketObjectTrap.cpp → components/openmw-mp/Packets/Object/PacketObjectTrap.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketObjectTrap::PacketObjectTrap(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketObjectTrap::PacketObjectTrap(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_TRAP;
hasCellData = true;
@ -11,7 +11,7 @@ PacketObjectTrap::PacketObjectTrap(RakNet::RakPeerInterface *peer) : WorldPacket
void PacketObjectTrap::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.isDisarmed, send);
if (!worldObject.isDisarmed)

4
components/openmw-mp/Packets/World/PacketObjectTrap.hpp → components/openmw-mp/Packets/Object/PacketObjectTrap.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETOBJECTTRAP_HPP
#define OPENMW_PACKETOBJECTTRAP_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectTrap final: public WorldPacket
class PacketObjectTrap final: public ObjectPacket
{
public:
explicit PacketObjectTrap(RakNet::RakPeerInterface *peer);

2
components/openmw-mp/Packets/World/PacketScriptGlobalFloat.cpp → components/openmw-mp/Packets/Object/PacketScriptGlobalFloat.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketScriptGlobalFloat::PacketScriptGlobalFloat(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketScriptGlobalFloat::PacketScriptGlobalFloat(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_SCRIPT_GLOBAL_FLOAT;
}

4
components/openmw-mp/Packets/World/PacketScriptGlobalFloat.hpp → components/openmw-mp/Packets/Object/PacketScriptGlobalFloat.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETSCRIPTGLOBALFLOAT_HPP
#define OPENMW_PACKETSCRIPTGLOBALFLOAT_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketScriptGlobalFloat : public WorldPacket
class PacketScriptGlobalFloat : public ObjectPacket
{
public:
PacketScriptGlobalFloat(RakNet::RakPeerInterface *peer);

2
components/openmw-mp/Packets/World/PacketScriptGlobalShort.cpp → components/openmw-mp/Packets/Object/PacketScriptGlobalShort.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketScriptGlobalShort::PacketScriptGlobalShort(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketScriptGlobalShort::PacketScriptGlobalShort(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_SCRIPT_GLOBAL_SHORT;
}

4
components/openmw-mp/Packets/World/PacketScriptGlobalShort.hpp → components/openmw-mp/Packets/Object/PacketScriptGlobalShort.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETSCRIPTGLOBALSHORT_HPP
#define OPENMW_PACKETSCRIPTGLOBALSHORT_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketScriptGlobalShort final: public WorldPacket
class PacketScriptGlobalShort final: public ObjectPacket
{
public:
explicit PacketScriptGlobalShort(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketScriptLocalFloat.cpp → components/openmw-mp/Packets/Object/PacketScriptLocalFloat.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketScriptLocalFloat::PacketScriptLocalFloat(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketScriptLocalFloat::PacketScriptLocalFloat(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_SCRIPT_LOCAL_FLOAT;
hasCellData = true;
@ -11,7 +11,7 @@ PacketScriptLocalFloat::PacketScriptLocalFloat(RakNet::RakPeerInterface *peer) :
void PacketScriptLocalFloat::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.index, send);
RW(worldObject.floatVal, send);
}

4
components/openmw-mp/Packets/World/PacketScriptLocalFloat.hpp → components/openmw-mp/Packets/Object/PacketScriptLocalFloat.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETSCRIPTLOCALFLOAT_HPP
#define OPENMW_PACKETSCRIPTLOCALFLOAT_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketScriptLocalFloat final: public WorldPacket
class PacketScriptLocalFloat final: public ObjectPacket
{
public:
explicit PacketScriptLocalFloat(RakNet::RakPeerInterface *peer);

4
components/openmw-mp/Packets/World/PacketScriptLocalShort.cpp → components/openmw-mp/Packets/Object/PacketScriptLocalShort.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketScriptLocalShort::PacketScriptLocalShort(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketScriptLocalShort::PacketScriptLocalShort(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_SCRIPT_LOCAL_SHORT;
hasCellData = true;
@ -11,7 +11,7 @@ PacketScriptLocalShort::PacketScriptLocalShort(RakNet::RakPeerInterface *peer) :
void PacketScriptLocalShort::Object(WorldObject &worldObject, bool send)
{
WorldPacket::Object(worldObject, send);
ObjectPacket::Object(worldObject, send);
RW(worldObject.index, send);
RW(worldObject.shortVal, send);
}

4
components/openmw-mp/Packets/World/PacketScriptLocalShort.hpp → components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp
View file

@ -1,11 +1,11 @@
#ifndef OPENMW_PACKETSCRIPTLOCALSHORT_HPP
#define OPENMW_PACKETSCRIPTLOCALSHORT_HPP
#include <components/openmw-mp/Packets/World/WorldPacket.hpp>
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketScriptLocalShort final: public WorldPacket
class PacketScriptLocalShort final: public ObjectPacket
{
public:
explicit PacketScriptLocalShort(RakNet::RakPeerInterface *peer);

2
components/openmw-mp/Packets/World/PacketScriptMemberFloat.cpp → components/openmw-mp/Packets/Object/PacketScriptMemberFloat.cpp
View file

@ -3,7 +3,7 @@
using namespace mwmp;
PacketScriptMemberFloat::PacketScriptMemberFloat(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
PacketScriptMemberFloat::PacketScriptMemberFloat(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_SCRIPT_MEMBER_FLOAT;
}

Some files were not shown because too many files have changed in this diff Show more