mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 06:15:32 +00:00
Code Issues Releases Wiki Activity

Replace ID_ACTIVATOR_ACTIVATE with ID_OBJECT_MOVE_WORLD

Browse source
This commit is contained in:
David Cernat 2016-10-25 12:42:29 +03:00
parent c25ebc34b3
commit 947a677801
8 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -495,9 +495,9 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
break;
}
case ID_DOOR_ACTIVATE:
case ID_OBJECT_MOVE_WORLD:
{
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_ACTIVATE from %s",
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_MOVE_WORLD from %s",
player->Npc()->mName.c_str());
myPacket->Read(event);
@ -512,9 +512,9 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
break;
}
case ID_ACTIVATOR_ACTIVATE:
case ID_DOOR_ACTIVATE:
{
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_ACTIVATOR_ACTIVATE from %s",
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_ACTIVATE from %s",
player->Npc()->mName.c_str());
myPacket->Read(event);

4
components/CMakeLists.txt
View file

@ -158,10 +158,10 @@ add_component_dir (openmw-mp
Packets/Player/PacketTime Packets/Player/PacketInventory
Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace Packets/World/PacketObjectLock
Packets/World/PacketObjectUnlock Packets/World/PacketObjectScale
Packets/World/PacketObjectUnlock Packets/World/PacketObjectScale Packets/World/PacketObjectMoveWorld
Packets/World/PacketContainerAdd Packets/World/PacketContainerRemove Packets/World/PacketDoorActivate
Packets/World/PacketActivatorActivate Packets/World/PacketVideoPlay)
Packets/World/PacketVideoPlay)
add_component_dir (fallback
fallback validate

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

@ -7,11 +7,11 @@
#include "../Packets/World/PacketObjectLock.hpp"
#include "../Packets/World/PacketObjectUnlock.hpp"
#include "../Packets/World/PacketObjectScale.hpp"
#include "../Packets/World/PacketObjectMoveWorld.hpp"
#include "../Packets/World/PacketContainerAdd.hpp"
#include "../Packets/World/PacketContainerRemove.hpp"
#include "../Packets/World/PacketDoorActivate.hpp"
#include "../Packets/World/PacketActivatorActivate.hpp"
#include "../Packets/World/PacketVideoPlay.hpp"
#include "WorldPacketController.hpp"
@ -31,11 +31,11 @@ mwmp::WorldPacketController::WorldPacketController(RakNet::RakPeerInterface *pee
AddPacket<PacketObjectLock>(&packets, peer);
AddPacket<PacketObjectUnlock>(&packets, peer);
AddPacket<PacketObjectScale>(&packets, peer);
AddPacket<PacketObjectMoveWorld>(&packets, peer);
AddPacket<PacketContainerAdd>(&packets, peer);
AddPacket<PacketContainerRemove>(&packets, peer);
AddPacket<PacketDoorActivate>(&packets, peer);
AddPacket<PacketActivatorActivate>(&packets, peer);
AddPacket<PacketVideoPlay>(&packets, peer);
}

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

@ -38,11 +38,11 @@ enum GameMessages
ID_OBJECT_LOCK,
ID_OBJECT_UNLOCK,
ID_OBJECT_SCALE,
ID_OBJECT_MOVE_WORLD,
ID_CONTAINER_ADD,
ID_CONTAINER_REMOVE,
ID_DOOR_ACTIVATE,
ID_ACTIVATOR_ACTIVATE,
ID_VIDEO_PLAY
};

14
components/openmw-mp/Packets/World/PacketActivatorActivate.cpp
View file

@ -1,14 +0,0 @@
#include <components/openmw-mp/NetworkMessages.hpp>
#include "PacketActivatorActivate.hpp"
using namespace mwmp;
PacketActivatorActivate::PacketActivatorActivate(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
{
packetID = ID_ACTIVATOR_ACTIVATE;
}
void PacketActivatorActivate::Packet(RakNet::BitStream *bs, WorldEvent *event, bool send)
{
WorldPacket::Packet(bs, event, send);
}

17
components/openmw-mp/Packets/World/PacketActivatorActivate.hpp
View file

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

14
components/openmw-mp/Packets/World/PacketObjectMoveWorld.cpp Normal file
View file

@ -0,0 +1,14 @@
#include <components/openmw-mp/NetworkMessages.hpp>
#include "PacketObjectMoveWorld.hpp"
using namespace mwmp;
PacketObjectMoveWorld::PacketObjectMoveWorld(RakNet::RakPeerInterface *peer) : WorldPacket(peer)
{
packetID = ID_OBJECT_MOVE_WORLD;
}
void PacketObjectMoveWorld::Packet(RakNet::BitStream *bs, WorldEvent *event, bool send)
{
WorldPacket::Packet(bs, event, send);
}

17
components/openmw-mp/Packets/World/PacketObjectMoveWorld.hpp Normal file
View file

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