From ca6883139524b0e44cb63beee90c307d41c67445 Mon Sep 17 00:00:00 2001 From: Koncord Date: Sun, 19 Feb 2017 20:37:26 +0800 Subject: [PATCH] [Server] Rename sendToNearest to sendToLoaded --- apps/openmw-mp/Networking.cpp | 14 +++++++------- apps/openmw-mp/Player.cpp | 2 +- apps/openmw-mp/Player.hpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp index c00163510..a71d4bde8 100644 --- a/apps/openmw-mp/Networking.cpp +++ b/apps/openmw-mp/Networking.cpp @@ -152,7 +152,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) myPacket->Read(player); //myPacket->Send(player, true); //send to other clients - player->sendToNearest(myPacket); + player->sendToLoaded(myPacket); } @@ -213,7 +213,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) myPacket->Read(player); //myPacket->Send(player, true); - player->sendToNearest(myPacket); + player->sendToLoaded(myPacket); Script::Call(player->getId()); } @@ -227,7 +227,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) { myPacket->Read(player); //myPacket->Send(player, true); - player->sendToNearest(myPacket); + player->sendToLoaded(myPacket); Script::Call(player->getId()); } @@ -254,7 +254,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) myPacket->Read(player); //myPacket->Send(player, true); - player->sendToNearest(myPacket); + player->sendToLoaded(myPacket); Script::Call(player->getId()); @@ -318,7 +318,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) } //myPacket->Send(player, true); - player->sendToNearest(myPacket); + player->sendToLoaded(myPacket); playerController->GetPacket(ID_PLAYER_DYNAMICSTATS)->RequestData(player->attack.target); } break; @@ -330,7 +330,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) myPacket->Read(player); //myPacket->Send(player, true); - player->sendToNearest(myPacket); + player->sendToLoaded(myPacket); break; } @@ -384,7 +384,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet) myPacket->Read(player); //myPacket->Send(player, true); - player->sendToNearest(myPacket); + player->sendToLoaded(myPacket); break; } diff --git a/apps/openmw-mp/Player.cpp b/apps/openmw-mp/Player.cpp index 19b2fc8a6..8a63aa1ee 100644 --- a/apps/openmw-mp/Player.cpp +++ b/apps/openmw-mp/Player.cpp @@ -141,7 +141,7 @@ CellController::TContainer Player::getCells() return cells; } -void Player::sendToNearest(mwmp::PlayerPacket *myPacket) +void Player::sendToLoaded(mwmp::PlayerPacket *myPacket) { std::list plList; diff --git a/apps/openmw-mp/Player.hpp b/apps/openmw-mp/Player.hpp index ebfb084be..41df9c780 100644 --- a/apps/openmw-mp/Player.hpp +++ b/apps/openmw-mp/Player.hpp @@ -71,7 +71,7 @@ public: virtual ~Player(); CellController::TContainer getCells(); - void sendToNearest(mwmp::PlayerPacket *myPacket); + void sendToLoaded(mwmp::PlayerPacket *myPacket); void doForNearest(std::function func);