fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master'

Browse source 
Conflicts:
	src/net/Client.cpp
This commit is contained in:
BenDroid 2018-03-02 23:22:06 +01:00
commit 563fdf6485
5 changed files with 140 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/api/NetworkState.cpp
View file

@ -46,7 +46,7 @@ NetworkState::NetworkState() :
int NetworkState::connectionTime() const
{
return m_active ? ((uv_now(uv_default_loop()) - m_connectionTime) / 1000) : 0;
return m_active ? (int)((uv_now(uv_default_loop()) - m_connectionTime) / 1000) : 0;
}
@ -56,7 +56,7 @@ uint32_t NetworkState::avgTime() const
return 0;
}
return (uint32_t) connectionTime() / m_latency.size();
return connectionTime() / (uint32_t)m_latency.size();
}