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

[General] Rename ID_DOOR_ACTIVATE into ID_DOOR_STATE

Browse source
This commit is contained in:
David Cernat 2017-02-01 11:54:40 +02:00
parent 8e438a1b82
commit 958ff06ca8
9 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -551,9 +551,9 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
break;
}
case ID_DOOR_ACTIVATE:
case ID_DOOR_STATE:
{
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_ACTIVATE from %s",
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_STATE from %s",
player->npc.mName.c_str());
myPacket->Read(worldEvent);

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

@ -821,13 +821,13 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
break;
}
case ID_DOOR_ACTIVATE:
case ID_DOOR_STATE:
{
MWWorld::CellStore *ptrCellStore = Main::get().getWorldController()->getCell(event->cell);
if (!ptrCellStore) return;
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_ACTIVATE");
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Received ID_DOOR_STATE");
event->activateDoors(ptrCellStore);
break;

4
apps/openmw/mwworld/worldimp.cpp
View file

@ -2275,7 +2275,7 @@ namespace MWWorld
worldObject.state = state;
event->addObject(worldObject);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_DOOR_ACTIVATE)->Send(event);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_DOOR_STATE)->Send(event);
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Door activation 1\n- cellRef: %s, %i\n- cell: %s\n- state: %s",
worldObject.refId.c_str(),
@ -2302,7 +2302,7 @@ namespace MWWorld
worldObject.state = state;
event->addObject(worldObject);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_DOOR_ACTIVATE)->Send(event);
mwmp::Main::get().getNetworking()->getWorldPacket(ID_DOOR_STATE)->Send(event);
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Door activation 2\n- cellRef: %s, %i\n- cell: %s\n- state: %s",
worldObject.refId.c_str(),

2
components/CMakeLists.txt
View file

@ -165,7 +165,7 @@ add_component_dir (openmw-mp
Packets/World/PacketObjectUnlock Packets/World/PacketObjectScale Packets/World/PacketObjectMove
Packets/World/PacketObjectRotate Packets/World/PacketObjectAnimPlay
Packets/World/PacketContainerAdd Packets/World/PacketContainerRemove Packets/World/PacketDoorActivate
Packets/World/PacketContainerAdd Packets/World/PacketContainerRemove Packets/World/PacketDoorState
Packets/World/PacketMusicPlay Packets/World/PacketVideoPlay
Packets/World/PacketScriptLocalShort Packets/World/PacketScriptLocalFloat Packets/World/PacketScriptMemberShort

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

@ -13,7 +13,7 @@
#include "../Packets/World/PacketContainerAdd.hpp"
#include "../Packets/World/PacketContainerRemove.hpp"
#include "../Packets/World/PacketDoorActivate.hpp"
#include "../Packets/World/PacketDoorState.hpp"
#include "../Packets/World/PacketMusicPlay.hpp"
#include "../Packets/World/PacketVideoPlay.hpp"
@ -45,7 +45,7 @@ mwmp::WorldPacketController::WorldPacketController(RakNet::RakPeerInterface *pee
AddPacket<PacketContainerAdd>(&packets, peer);
AddPacket<PacketContainerRemove>(&packets, peer);
AddPacket<PacketDoorActivate>(&packets, peer);
AddPacket<PacketDoorState>(&packets, peer);
AddPacket<PacketMusicPlay>(&packets, peer);
AddPacket<PacketVideoPlay>(&packets, peer);

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

@ -50,7 +50,7 @@ enum GameMessages
ID_CONTAINER_ADD,
ID_CONTAINER_REMOVE,
ID_DOOR_ACTIVATE,
ID_DOOR_STATE,
ID_MUSIC_PLAY,
ID_VIDEO_PLAY,

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

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

8
components/openmw-mp/Packets/World/PacketDoorActivate.cpp → components/openmw-mp/Packets/World/PacketDoorState.cpp
View file

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

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

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