mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:23:52 +00:00
Code Issues Releases Wiki Activity

[Server] Minor fixes

Browse source
This commit is contained in:
Koncord 2017-10-11 06:26:09 +08:00
parent 6cb9c3c713
commit 62588ce088
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw-mp/MasterClient.cpp
View file

@ -109,7 +109,7 @@ void MasterClient::SetRuleValue(std::string key, double value)
void MasterClient::PushPlugin(Plugin plugin) void MasterClient::PushPlugin(Plugin plugin)
{ {
mutexData.lock(); mutexData.lock();
queryData.plugins.push_back(plugin); queryData.plugins.push_back(move(plugin));
updated = true; updated = true;
mutexData.unlock(); mutexData.unlock();
} }

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

@ -30,7 +30,7 @@
using namespace mwmp; using namespace mwmp;
using namespace std; using namespace std;
Networking *Networking::sThis = 0; Networking *Networking::sThis = nullptr;
static int currentMpNum = 0; static int currentMpNum = 0;
@ -48,9 +48,9 @@ Networking::Networking(RakNet::RakPeerInterface *peer) : mclient(nullptr)
worldPacketController = new WorldPacketController(peer); worldPacketController = new WorldPacketController(peer);
// Set send stream // Set send stream
playerPacketController->SetStream(0, &bsOut); playerPacketController->SetStream(nullptr, &bsOut);
actorPacketController->SetStream(0, &bsOut); actorPacketController->SetStream(nullptr, &bsOut);
worldPacketController->SetStream(0, &bsOut); worldPacketController->SetStream(nullptr, &bsOut);
running = true; running = true;
exitCode = 0; exitCode = 0;
@ -244,7 +244,7 @@ bool Networking::update(RakNet::Packet *packet)
return false; return false;
} }
playerPacketController->SetStream(&bsIn, 0); playerPacketController->SetStream(&bsIn, nullptr);
playerPacketController->GetPacket(ID_HANDSHAKE)->RequestData(packet->guid); playerPacketController->GetPacket(ID_HANDSHAKE)->RequestData(packet->guid);
player = Players::addPlayer(packet->guid); player = Players::addPlayer(packet->guid);
@ -253,21 +253,21 @@ bool Networking::update(RakNet::Packet *packet)
if (playerPacketController->ContainsPacket(packet->data[0])) if (playerPacketController->ContainsPacket(packet->data[0]))
{ {
playerPacketController->SetStream(&bsIn, 0); playerPacketController->SetStream(&bsIn, nullptr);
processPlayerPacket(packet); processPlayerPacket(packet);
return true; return true;
} }
if (actorPacketController->ContainsPacket(packet->data[0])) if (actorPacketController->ContainsPacket(packet->data[0]))
{ {
actorPacketController->SetStream(&bsIn, 0); actorPacketController->SetStream(&bsIn, nullptr);
processActorPacket(packet); processActorPacket(packet);
return true; return true;
} }
if (worldPacketController->ContainsPacket(packet->data[0])) if (worldPacketController->ContainsPacket(packet->data[0]))
{ {
worldPacketController->SetStream(&bsIn, 0); worldPacketController->SetStream(&bsIn, nullptr);
processWorldPacket(packet); processWorldPacket(packet);
return true; return true;
} }
@ -398,17 +398,17 @@ PacketPreInit::PluginContainer Networking::getPluginListSample()
{ {
unsigned field = 0; unsigned field = 0;
auto name = luaState.getEventCtrl().Call<CoreEvent::ON_REQUEST_PLUGIN_LIST, string>(id, field++); auto name = luaState.getEventCtrl().Call<CoreEvent::ON_REQUEST_PLUGIN_LIST, string>(id, field++);
if (name.size() == 0) if (name.empty())
break; break;
PacketPreInit::HashList hashList; PacketPreInit::HashList hashList;
while (true) while (true)
{ {
auto hash = luaState.getEventCtrl().Call<CoreEvent::ON_REQUEST_PLUGIN_LIST, string>(id, field++); auto hash = luaState.getEventCtrl().Call<CoreEvent::ON_REQUEST_PLUGIN_LIST, string>(id, field++);
if (hash.size() == 0) if (hash.empty())
break; break;
hashList.push_back((unsigned)stoul(hash)); hashList.push_back((unsigned)stoul(hash));
} }
pls.push_back({name, hashList}); pls.emplace_back(name, hashList);
id++; id++;
} }
return pls; return pls;
@ -525,7 +525,7 @@ MasterClient *Networking::getMasterClient()
return mclient; return mclient;
} }
void Networking::InitQuery(std::string queryAddr, unsigned short queryPort) void Networking::InitQuery(const std::string &queryAddr, unsigned short queryPort)
{ {
mclient = new MasterClient(peer, queryAddr, queryPort); mclient = new MasterClient(peer, queryAddr, queryPort);
} }

2
apps/openmw-mp/Networking.hpp
View file

@ -55,7 +55,7 @@ namespace mwmp
int incrementMpNum(); int incrementMpNum();
MasterClient *getMasterClient(); MasterClient *getMasterClient();
void InitQuery(std::string queryAddr, unsigned short queryPort); void InitQuery(const std::string &queryAddr, unsigned short queryPort);
void setServerPassword(std::string passw) noexcept; void setServerPassword(std::string passw) noexcept;
bool isPassworded() const; bool isPassworded() const;