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

Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp

Browse source
This commit is contained in:
David Cernat 2016-11-04 15:52:13 +02:00
commit 4d053743a0
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -845,4 +845,9 @@ unsigned short Networking::NumberOfConnections() const
unsigned int Networking::MaxConnections() const
{
return peer->GetMaximumIncomingConnections();
}
}
int Networking::GetAvgPing(RakNet::AddressOrGUID addr) const
{
return peer->GetAveragePing(addr);
}

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

@ -27,6 +27,7 @@ namespace mwmp
unsigned short NumberOfConnections() const;
unsigned int MaxConnections() const;
int GetAvgPing(RakNet::AddressOrGUID) const;
int MainLoop();

9
apps/openmw-mp/Script/ScriptFunctions.cpp
View file

@ -130,4 +130,11 @@ const char *ScriptFunctions::GetProtocolVersion() noexcept
{
static string version = to_string(TES3MP_PROTO_VERSION);
return version.c_str();
}
}
int ScriptFunctions::GetAvgPing(unsigned short pid) noexcept
{
Player *player;
GET_PLAYER(pid, player,-1);
return mwmp::Networking::Get().GetAvgPing(player->guid);
}

4
apps/openmw-mp/Script/ScriptFunctions.hpp
View file

@ -60,6 +60,7 @@ public:
static void Kick(unsigned short pid) noexcept;
static const char *GetServerVersion() noexcept;
static const char *GetProtocolVersion() noexcept;
static int GetAvgPing(unsigned short pid) noexcept;
static constexpr ScriptFunctionData functions[]{
{"CreateTimer", ScriptFunctions::CreateTimer},
@ -80,7 +81,8 @@ public:
{"SendMessage", ScriptFunctions::SendMessage},
{"Kick", ScriptFunctions::Kick},
{"GetServerVersion", ScriptFunctions::GetServerVersion},
{"GetProtocolVersion", ScriptFunctions::GetProtocolVersion},
{"GetProtocolVersion", ScriptFunctions::GetProtocolVersion},
{"GetAvgPing", ScriptFunctions::GetAvgPing},
TRANSLOCATIONFUNCTIONS,
STATSFUNCTIONS,