mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

[General] Rename PlayerPos into PlayerPosition

Browse Source
pull/176/merge
David Cernat 8 years ago
parent 7b07d6651f
commit 6a21ec1fdc
12 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
apps/openmw-mp/CMakeLists.txt
Unescape Escape View File

@ -118,7 +118,7 @@ set(PROCESSORS_PLAYER
processors/player/ProcessorPlayerCharClass.hpp processors/player/ProcessorPlayerCharGen.hpp processors/player/ProcessorPlayerCharClass.hpp processors/player/ProcessorPlayerCharGen.hpp
processors/player/ProcessorPlayerDeath.hpp processors/player/ProcessorPlayerEquipment.hpp processors/player/ProcessorPlayerDeath.hpp processors/player/ProcessorPlayerEquipment.hpp
processors/player/ProcessorPlayerInventory.hpp processors/player/ProcessorPlayerJournal.hpp processors/player/ProcessorPlayerInventory.hpp processors/player/ProcessorPlayerJournal.hpp
processors/player/ProcessorPlayerLevel.hpp processors/player/ProcessorPlayerPos.hpp processors/player/ProcessorPlayerLevel.hpp processors/player/ProcessorPlayerPosition.hpp
processors/player/ProcessorPlayerResurrect.hpp processors/player/ProcessorPlayerSkill.hpp processors/player/ProcessorPlayerResurrect.hpp processors/player/ProcessorPlayerSkill.hpp
processors/player/ProcessorPlayerSpellbook.hpp processors/player/ProcessorPlayerStatsDynamic.hpp processors/player/ProcessorPlayerSpellbook.hpp processors/player/ProcessorPlayerStatsDynamic.hpp
) )

6
apps/openmw-mp/Networking.cpp
Unescape Escape View File

@ -242,7 +242,7 @@ void Networking::newPlayer(RakNet::RakNetGUID guid)
{ {
playerPacketController->GetPacket(ID_PLAYER_BASEINFO)->RequestData(guid); playerPacketController->GetPacket(ID_PLAYER_BASEINFO)->RequestData(guid);
playerPacketController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->RequestData(guid); playerPacketController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->RequestData(guid);
playerPacketController->GetPacket(ID_PLAYER_POS)->RequestData(guid); playerPacketController->GetPacket(ID_PLAYER_POSITION)->RequestData(guid);
playerPacketController->GetPacket(ID_PLAYER_CELL_CHANGE)->RequestData(guid); playerPacketController->GetPacket(ID_PLAYER_CELL_CHANGE)->RequestData(guid);
playerPacketController->GetPacket(ID_PLAYER_EQUIPMENT)->RequestData(guid); playerPacketController->GetPacket(ID_PLAYER_EQUIPMENT)->RequestData(guid);
@ -266,7 +266,7 @@ void Networking::newPlayer(RakNet::RakNetGUID guid)
playerPacketController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->setPlayer(pl->second); playerPacketController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->setPlayer(pl->second);
playerPacketController->GetPacket(ID_PLAYER_ATTRIBUTE)->setPlayer(pl->second); playerPacketController->GetPacket(ID_PLAYER_ATTRIBUTE)->setPlayer(pl->second);
playerPacketController->GetPacket(ID_PLAYER_SKILL)->setPlayer(pl->second); playerPacketController->GetPacket(ID_PLAYER_SKILL)->setPlayer(pl->second);
playerPacketController->GetPacket(ID_PLAYER_POS)->setPlayer(pl->second); playerPacketController->GetPacket(ID_PLAYER_POSITION)->setPlayer(pl->second);
playerPacketController->GetPacket(ID_PLAYER_CELL_CHANGE)->setPlayer(pl->second); playerPacketController->GetPacket(ID_PLAYER_CELL_CHANGE)->setPlayer(pl->second);
playerPacketController->GetPacket(ID_PLAYER_EQUIPMENT)->setPlayer(pl->second); playerPacketController->GetPacket(ID_PLAYER_EQUIPMENT)->setPlayer(pl->second);
@ -274,7 +274,7 @@ void Networking::newPlayer(RakNet::RakNetGUID guid)
playerPacketController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->Send(guid); playerPacketController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->Send(guid);
playerPacketController->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(guid); playerPacketController->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(guid);
playerPacketController->GetPacket(ID_PLAYER_SKILL)->Send(guid); playerPacketController->GetPacket(ID_PLAYER_SKILL)->Send(guid);
playerPacketController->GetPacket(ID_PLAYER_POS)->Send(guid); playerPacketController->GetPacket(ID_PLAYER_POSITION)->Send(guid);
playerPacketController->GetPacket(ID_PLAYER_CELL_CHANGE)->Send(guid); playerPacketController->GetPacket(ID_PLAYER_CELL_CHANGE)->Send(guid);
playerPacketController->GetPacket(ID_PLAYER_EQUIPMENT)->Send(guid); playerPacketController->GetPacket(ID_PLAYER_EQUIPMENT)->Send(guid);
} }

4
apps/openmw-mp/ProcessorInitializer.cpp
Unescape Escape View File

@ -5,7 +5,7 @@
#include "ProcessorInitializer.hpp" #include "ProcessorInitializer.hpp"
#include "PlayerProcessor.hpp" #include "PlayerProcessor.hpp"
#include "processors/player/ProcessorPlayerPos.hpp" #include "processors/player/ProcessorPlayerPosition.hpp"
#include "processors/player/ProcessorPlayerCellChange.hpp" #include "processors/player/ProcessorPlayerCellChange.hpp"
#include "processors/player/ProcessorPlayerCellState.hpp" #include "processors/player/ProcessorPlayerCellState.hpp"
#include "processors/player/ProcessorPlayerAttribute.hpp" #include "processors/player/ProcessorPlayerAttribute.hpp"
@ -59,7 +59,7 @@ using namespace mwmp;
void ProcessorInitializer() void ProcessorInitializer()
{ {
PlayerProcessor::AddProcessor(new ProcessorPlayerPos()); PlayerProcessor::AddProcessor(new ProcessorPlayerPosition());
PlayerProcessor::AddProcessor(new ProcessorPlayerCellChange()); PlayerProcessor::AddProcessor(new ProcessorPlayerCellChange());
PlayerProcessor::AddProcessor(new ProcessorPlayerCellState()); PlayerProcessor::AddProcessor(new ProcessorPlayerCellState());
PlayerProcessor::AddProcessor(new ProcessorPlayerAttribute()); PlayerProcessor::AddProcessor(new ProcessorPlayerAttribute());

4
apps/openmw-mp/Script/Functions/Positions.cpp
Unescape Escape View File

@ -109,6 +109,6 @@ void PositionFunctions::SendPos(unsigned short pid) noexcept
Player *player; Player *player;
GET_PLAYER(pid, player, ); GET_PLAYER(pid, player, );
mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_POS)->setPlayer(player); mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_POSITION)->setPlayer(player);
mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_POS)->Send(false); mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_POSITION)->Send(false);
} }

8
apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
Unescape Escape View File

@ -43,14 +43,14 @@ namespace mwmp
playerController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->setPlayer(other); playerController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->setPlayer(other);
playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->setPlayer(other); playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->setPlayer(other);
playerController->GetPacket(ID_PLAYER_POS)->setPlayer(other); playerController->GetPacket(ID_PLAYER_POSITION)->setPlayer(other);
playerController->GetPacket(ID_PLAYER_SKILL)->setPlayer(other); playerController->GetPacket(ID_PLAYER_SKILL)->setPlayer(other);
playerController->GetPacket(ID_PLAYER_EQUIPMENT)->setPlayer(other); playerController->GetPacket(ID_PLAYER_EQUIPMENT)->setPlayer(other);
playerController->GetPacket(ID_PLAYER_ANIM_FLAGS)->setPlayer(other); playerController->GetPacket(ID_PLAYER_ANIM_FLAGS)->setPlayer(other);
playerController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->Send(pl->guid); playerController->GetPacket(ID_PLAYER_STATS_DYNAMIC)->Send(pl->guid);
playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(pl->guid); playerController->GetPacket(ID_PLAYER_ATTRIBUTE)->Send(pl->guid);
playerController->GetPacket(ID_PLAYER_POS)->Send(pl->guid); playerController->GetPacket(ID_PLAYER_POSITION)->Send(pl->guid);
playerController->GetPacket(ID_PLAYER_SKILL)->Send(pl->guid); playerController->GetPacket(ID_PLAYER_SKILL)->Send(pl->guid);
playerController->GetPacket(ID_PLAYER_EQUIPMENT)->Send(pl->guid); playerController->GetPacket(ID_PLAYER_EQUIPMENT)->Send(pl->guid);
playerController->GetPacket(ID_PLAYER_ANIM_FLAGS)->Send(pl->guid); playerController->GetPacket(ID_PLAYER_ANIM_FLAGS)->Send(pl->guid);
@ -71,8 +71,8 @@ namespace mwmp
} }
}); });
playerController->GetPacket(ID_PLAYER_POS)->setPlayer(&player); playerController->GetPacket(ID_PLAYER_POSITION)->setPlayer(&player);
playerController->GetPacket(ID_PLAYER_POS)->Send(); playerController->GetPacket(ID_PLAYER_POSITION)->Send();
packet.setPlayer(&player); packet.setPlayer(&player);
packet.Send(true); //send to other clients packet.Send(true); //send to other clients

12
apps/openmw-mp/processors/player/ProcessorPlayerPos.hpp → apps/openmw-mp/processors/player/ProcessorPlayerPosition.hpp
Unescape Escape View File

@ -2,19 +2,19 @@
// Created by koncord on 31.03.17. // Created by koncord on 31.03.17.
// //
#ifndef OPENMW_PROCESSORPLAYERPOS_HPP #ifndef OPENMW_PROCESSORPLAYERPOSITION_HPP
#define OPENMW_PROCESSORPLAYERPOS_HPP #define OPENMW_PROCESSORPLAYERPOSITION_HPP
#include "apps/openmw-mp/PlayerProcessor.hpp" #include "apps/openmw-mp/PlayerProcessor.hpp"
namespace mwmp namespace mwmp
{ {
class ProcessorPlayerPos : public PlayerProcessor class ProcessorPlayerPosition : public PlayerProcessor
{ {
public: public:
ProcessorPlayerPos() ProcessorPlayerPosition()
{ {
BPP_INIT(ID_PLAYER_POS) BPP_INIT(ID_PLAYER_POSITION)
} }
void Do(PlayerPacket &packet, Player &player) override void Do(PlayerPacket &packet, Player &player) override
@ -28,4 +28,4 @@ namespace mwmp
}; };
} }
#endif //OPENMW_PROCESSORPLAYERPOS_HPP #endif //OPENMW_PROCESSORPLAYERPOSITION_HPP

2
apps/openmw/CMakeLists.txt
Unescape Escape View File

@ -109,7 +109,7 @@ add_openmw_dir (mwmp\\processors\\player ProcessorChatMessage ProcessorGameConso
ProcessorHandshake ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBaseInfo ProcessorPlayerBounty ProcessorHandshake ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBaseInfo ProcessorPlayerBounty
ProcessorPlayerCellChange ProcessorPlayerCellState ProcessorPlayerCharClass ProcessorPlayerCharGen ProcessorPlayerDeath ProcessorPlayerCellChange ProcessorPlayerCellState ProcessorPlayerCharClass ProcessorPlayerCharGen ProcessorPlayerDeath
ProcessorPlayerAnimFlags ProcessorPlayerStatsDynamic ProcessorPlayerEquipment ProcessorPlayerInventory ProcessorPlayerAnimFlags ProcessorPlayerStatsDynamic ProcessorPlayerEquipment ProcessorPlayerInventory
ProcessorPlayerJournal ProcessorPlayerLevel ProcessorPlayerPos ProcessorPlayerResurrect ProcessorPlayerSkill ProcessorPlayerJournal ProcessorPlayerLevel ProcessorPlayerPosition ProcessorPlayerResurrect ProcessorPlayerSkill
ProcessorPlayerSpellbook ProcessorUserDisconnected ProcessorUserMyID ProcessorPlayerSpellbook ProcessorUserDisconnected ProcessorUserMyID
) )

8
apps/openmw/mwmp/LocalPlayer.cpp
Unescape Escape View File

@ -327,8 +327,8 @@ void LocalPlayer::updatePosition(bool forceUpdate)
direction.pos[1] = move.mPosition[1]; direction.pos[1] = move.mPosition[1];
direction.pos[2] = move.mPosition[2]; direction.pos[2] = move.mPosition[2];
getNetworking()->getPlayerPacket(ID_PLAYER_POS)->setPlayer(this); getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->setPlayer(this);
getNetworking()->getPlayerPacket(ID_PLAYER_POS)->Send(); getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->Send();
} }
else if (isJumping && world->isOnGround(player)) else if (isJumping && world->isOnGround(player))
{ {
@ -340,8 +340,8 @@ void LocalPlayer::updatePosition(bool forceUpdate)
{ {
sentJumpEnd = true; sentJumpEnd = true;
position = ptrPos; position = ptrPos;
getNetworking()->getPlayerPacket(ID_PLAYER_POS)->setPlayer(this); getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->setPlayer(this);
getNetworking()->getPlayerPacket(ID_PLAYER_POS)->Send(); getNetworking()->getPlayerPacket(ID_PLAYER_POSITION)->Send();
} }
} }

4
apps/openmw/mwmp/ProcessorInitializer.cpp
Unescape Escape View File

@ -5,7 +5,7 @@
#include "ProcessorInitializer.hpp" #include "ProcessorInitializer.hpp"
#include "PlayerProcessor.hpp" #include "PlayerProcessor.hpp"
#include "processors/player/ProcessorPlayerPos.hpp" #include "processors/player/ProcessorPlayerPosition.hpp"
#include "processors/player/ProcessorPlayerCellChange.hpp" #include "processors/player/ProcessorPlayerCellChange.hpp"
#include "processors/player/ProcessorPlayerCellState.hpp" #include "processors/player/ProcessorPlayerCellState.hpp"
#include "processors/player/ProcessorPlayerAttribute.hpp" #include "processors/player/ProcessorPlayerAttribute.hpp"
@ -63,7 +63,7 @@ using namespace mwmp;
void ProcessorInitializer() void ProcessorInitializer()
{ {
PlayerProcessor::AddProcessor(new ProcessorPlayerPos()); PlayerProcessor::AddProcessor(new ProcessorPlayerPosition());
PlayerProcessor::AddProcessor(new ProcessorPlayerCellChange()); PlayerProcessor::AddProcessor(new ProcessorPlayerCellChange());
PlayerProcessor::AddProcessor(new ProcessorPlayerCellState()); PlayerProcessor::AddProcessor(new ProcessorPlayerCellState());
PlayerProcessor::AddProcessor(new ProcessorPlayerAttribute()); PlayerProcessor::AddProcessor(new ProcessorPlayerAttribute());

14
apps/openmw/mwmp/processors/player/ProcessorPlayerPos.hpp → apps/openmw/mwmp/processors/player/ProcessorPlayerPosition.hpp
Unescape Escape View File

@ -2,20 +2,20 @@
// Created by koncord on 16.04.17. // Created by koncord on 16.04.17.
// //
#ifndef OPENMW_PROCESSORPLAYERPOS_HPP #ifndef OPENMW_PROCESSORPLAYERPOSITION_HPP
#define OPENMW_PROCESSORPLAYERPOS_HPP #define OPENMW_PROCESSORPLAYERPOSITION_HPP
#include "apps/openmw/mwmp/PlayerProcessor.hpp" #include "apps/openmw/mwmp/PlayerProcessor.hpp"
namespace mwmp namespace mwmp
{ {
class ProcessorPlayerPos : public PlayerProcessor class ProcessorPlayerPosition : public PlayerProcessor
{ {
public: public:
ProcessorPlayerPos() ProcessorPlayerPosition()
{ {
BPP_INIT(ID_PLAYER_POS) BPP_INIT(ID_PLAYER_POSITION)
} }
virtual void Do(PlayerPacket &packet, BasePlayer *player) virtual void Do(PlayerPacket &packet, BasePlayer *player)
@ -24,7 +24,7 @@ namespace mwmp
{ {
if (!isRequest()) if (!isRequest())
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "ID_PLAYER_POS changed by server"); LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "ID_PLAYER_POSITION changed by server");
static_cast<LocalPlayer*>(player)->setPosition(); static_cast<LocalPlayer*>(player)->setPosition();
} }
@ -38,4 +38,4 @@ namespace mwmp
} }
#endif //OPENMW_PROCESSORPLAYERPOS_HPP #endif //OPENMW_PROCESSORPLAYERPOSITION_HPP

2
components/openmw-mp/NetworkMessages.hpp
Unescape Escape View File

@ -12,7 +12,7 @@ enum GameMessages
_ID_UNUSED = ID_USER_PACKET_ENUM+1, _ID_UNUSED = ID_USER_PACKET_ENUM+1,
ID_PLAYER_BASEINFO, ID_PLAYER_BASEINFO,
ID_PLAYER_CHARGEN, ID_PLAYER_CHARGEN,
ID_PLAYER_POS, ID_PLAYER_POSITION,
ID_PLAYER_STATS_DYNAMIC, ID_PLAYER_STATS_DYNAMIC,
ID_PLAYER_ATTACK, ID_PLAYER_ATTACK,
ID_USER_MYID, ID_USER_MYID,

2
components/openmw-mp/Packets/Player/PacketPlayerPosition.cpp
Unescape Escape View File

@ -10,7 +10,7 @@ using namespace mwmp;
PacketPlayerPosition::PacketPlayerPosition(RakNet::RakPeerInterface *peer) : PlayerPacket(peer) PacketPlayerPosition::PacketPlayerPosition(RakNet::RakPeerInterface *peer) : PlayerPacket(peer)
{ {
packetID = ID_PLAYER_POS; packetID = ID_PLAYER_POSITION;
priority = MEDIUM_PRIORITY; priority = MEDIUM_PRIORITY;
//reliability = UNRELIABLE_SEQUENCED; //reliability = UNRELIABLE_SEQUENCED;
} }

Write Preview
Loading…
Cancel
Save