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

[General] Remove unused packet placeholder ID_OBJECT_HEALTH

Browse source
This commit is contained in:
David Cernat 2017-02-16 18:46:39 +02:00
parent 1198caddf6
commit 27c4015f50
6 changed files with 2 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -537,17 +537,6 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
break; break;
} }
case ID_OBJECT_HEALTH:
{
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_OBJECT_HEALTH from %s",
player->npc.mName.c_str());
myPacket->Read(baseEvent);
myPacket->Send(baseEvent, true);
break;
}
case ID_DOOR_STATE: case ID_DOOR_STATE:
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_STATE from %s", LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_STATE from %s",

4
components/CMakeLists.txt
View file

@ -164,8 +164,8 @@ add_component_dir (openmw-mp
Packets/Player/PacketGUIBoxes Packets/Player/PacketTime Packets/Player/PacketGUIBoxes Packets/Player/PacketTime
Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace Packets/World/PacketObjectScale Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace Packets/World/PacketObjectScale
Packets/World/PacketObjectHealth Packets/World/PacketObjectLock Packets/World/PacketObjectUnlock Packets/World/PacketObjectLock Packets/World/PacketObjectUnlock Packets/World/PacketObjectMove
Packets/World/PacketObjectMove Packets/World/PacketObjectRotate Packets/World/PacketObjectAnimPlay Packets/World/PacketObjectRotate Packets/World/PacketObjectAnimPlay
Packets/World/PacketContainer Packets/World/PacketDoorState Packets/World/PacketMusicPlay Packets/World/PacketContainer Packets/World/PacketDoorState Packets/World/PacketMusicPlay
Packets/World/PacketVideoPlay Packets/World/PacketVideoPlay

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

@ -5,7 +5,6 @@
#include "../Packets/World/PacketObjectDelete.hpp" #include "../Packets/World/PacketObjectDelete.hpp"
#include "../Packets/World/PacketObjectPlace.hpp" #include "../Packets/World/PacketObjectPlace.hpp"
#include "../Packets/World/PacketObjectScale.hpp" #include "../Packets/World/PacketObjectScale.hpp"
#include "../Packets/World/PacketObjectHealth.hpp"
#include "../Packets/World/PacketObjectLock.hpp" #include "../Packets/World/PacketObjectLock.hpp"
#include "../Packets/World/PacketObjectUnlock.hpp" #include "../Packets/World/PacketObjectUnlock.hpp"
#include "../Packets/World/PacketObjectMove.hpp" #include "../Packets/World/PacketObjectMove.hpp"
@ -37,7 +36,6 @@ mwmp::WorldPacketController::WorldPacketController(RakNet::RakPeerInterface *pee
AddPacket<PacketObjectDelete>(&packets, peer); AddPacket<PacketObjectDelete>(&packets, peer);
AddPacket<PacketObjectPlace>(&packets, peer); AddPacket<PacketObjectPlace>(&packets, peer);
AddPacket<PacketObjectScale>(&packets, peer); AddPacket<PacketObjectScale>(&packets, peer);
AddPacket<PacketObjectHealth>(&packets, peer);
AddPacket<PacketObjectLock>(&packets, peer); AddPacket<PacketObjectLock>(&packets, peer);
AddPacket<PacketObjectUnlock>(&packets, peer); AddPacket<PacketObjectUnlock>(&packets, peer);
AddPacket<PacketObjectMove>(&packets, peer); AddPacket<PacketObjectMove>(&packets, peer);

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

@ -42,7 +42,6 @@ enum GameMessages
ID_OBJECT_PLACE, ID_OBJECT_PLACE,
ID_OBJECT_DELETE, ID_OBJECT_DELETE,
ID_OBJECT_SCALE, ID_OBJECT_SCALE,
ID_OBJECT_HEALTH,
ID_OBJECT_LOCK, ID_OBJECT_LOCK,
ID_OBJECT_UNLOCK, ID_OBJECT_UNLOCK,
ID_OBJECT_MOVE, ID_OBJECT_MOVE,

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

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

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

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