mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-12 05:51:43 +00:00
Code Issues Releases Wiki Activity

[General] Simplify ProxyMasterPacket

Browse source
This commit is contained in:
Koncord 2018-01-05 09:06:10 +08:00
parent 5b8f4f3e92
commit ef0384b296
1 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
components/openmw-mp/Master/ProxyMasterPacket.hpp
View file

@ -64,29 +64,21 @@ namespace mwmp
vector<string>::iterator plIt; vector<string>::iterator plIt;
if (send)
plIt = server.players.begin();
else
server.players.clear();
int32_t playersCount = server.players.size(); int32_t playersCount = server.players.size();
packet->RW(playersCount, send); packet->RW(playersCount, send);
if (playersCount > 2000) if (playersCount > 2000)
playersCount = 0; playersCount = 0;
while (playersCount--) if(!send)
{ {
string player; server.players.clear();
if (send) server.players.resize(playersCount);
player = *plIt; }
for(auto &&player : server.players)
packet->RW(player, send); packet->RW(player, send);
if (!send)
server.players.push_back(player);
else
plIt++;
}
int32_t pluginsCount = server.plugins.size(); int32_t pluginsCount = server.plugins.size();
packet->RW(pluginsCount, send); packet->RW(pluginsCount, send);
@ -94,25 +86,16 @@ namespace mwmp
if (pluginsCount > 2000) if (pluginsCount > 2000)
pluginsCount = 0; pluginsCount = 0;
vector<Plugin>::iterator pluginIt; if(!send)
if (send)
pluginIt = server.plugins.begin();
else
server.plugins.clear();
while (pluginsCount--)
{ {
Plugin plugin; server.plugins.clear();
if (send) server.plugins.resize(pluginsCount);
plugin = *pluginIt; }
for(auto &&plugin : server.plugins)
{
packet->RW(plugin.name, send); packet->RW(plugin.name, send);
packet->RW(plugin.hash, send); packet->RW(plugin.hash, send);
if (!send)
server.plugins.push_back(plugin);
else
pluginIt++;
} }
} }
}; };