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

[General] Use simple types for master server packets

Browse source
This commit is contained in:
Koncord 2017-05-20 16:46:59 +08:00
parent b0cd636924
commit 80bd268de6
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
components/openmw-mp/Master/PacketMasterQuery.cpp
View file

@ -34,22 +34,25 @@ void PacketMasterQuery::Packet(RakNet::BitStream *bs, bool send)
serverIt = servers->begin();
QueryData server;
SystemAddress sa;
string addr;
unsigned short port;
while(serversCount--)
{
if (send)
{
sa = serverIt->first;
addr = serverIt->first.ToString(false);
port = serverIt->first.GetPort();
server = serverIt->second;
}
RW(addr, send);
RW(port, send);
RW(sa, send);
ProxyMasterPacket::addServer(this, server, send);
if (send)
serverIt++;
else
servers->insert(pair<SystemAddress, QueryData>(sa, server));
servers->insert(pair<SystemAddress, QueryData>(SystemAddress(addr.c_str(), port), server));
}
}

9
components/openmw-mp/Master/PacketMasterUpdate.cpp
View file

@ -22,7 +22,14 @@ void PacketMasterUpdate::Packet(RakNet::BitStream *bs, bool send)
if (send)
bs->Write(packetID);
RW(server->first, send);
string addr = server->first.ToString(false);
unsigned short port = server->first.GetPort();
RW(addr, send);
RW(port, send);
if(!send)
server->first = SystemAddress(addr.c_str(), port);
ProxyMasterPacket::addServer(this, server->second, send);