ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't show timer warning if voting timeout is not default

Browse Source
This commit is contained in:
Benau 2018-08-27 13:49:52 +08:00
parent 0f39add432
commit 732fd7a4c9
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/protocols/client_lobby.cpp
View File

@ -216,11 +216,14 @@ void ClientLobby::addAllPlayers(Event* event)
// time // time
if (!STKHost::get()->getNetworkTimerSynchronizer()->isSynchronised()) if (!STKHost::get()->getNetworkTimerSynchronizer()->isSynchronised())
{ {
core::stringw msg = _("Bad network connection is detected."); if (UserConfigParams::m_voting_timeout >= 10.0f)
MessageQueue::add(MessageQueue::MT_ERROR, msg); {
Log::warn("ClientLobby", "Failed to synchronize timer before game " core::stringw msg = _("Bad network connection is detected.");
"start, maybe you enter the game too quick? (at least 5 seconds " MessageQueue::add(MessageQueue::MT_ERROR, msg);
"are required for synchronization."); Log::warn("ClientLobby", "Failed to synchronize timer before game "
"start, maybe you enter the game too quick? (at least 5 "
"seconds are required for synchronization.");
}
STKHost::get()->getNetworkTimerSynchronizer()->enableForceSetTimer(); STKHost::get()->getNetworkTimerSynchronizer()->enableForceSetTimer();
} }

3
src/network/stk_host.cpp
View File

@ -759,7 +759,8 @@ void STKHost::mainLoop()
const unsigned ap = p.second->getAveragePing(); const unsigned ap = p.second->getAveragePing();
const unsigned max_ping = UserConfigParams::m_max_ping; const unsigned max_ping = UserConfigParams::m_max_ping;
if (UserConfigParams::m_kick_high_ping_players && if (UserConfigParams::m_kick_high_ping_players &&
p.second->isValidated() && ap > max_ping) p.second->isValidated() &&
p.second->getConnectedTime() > 5.0f && ap > max_ping)
{ {
Log::info("STKHost", "%s with ping %d is higher than" Log::info("STKHost", "%s with ping %d is higher than"
" %d ms, kick.", " %d ms, kick.",

3
src/network/stk_peer.cpp
View File

@ -156,7 +156,10 @@ bool STKPeer::isSamePeer(const ENetPeer* peer) const
uint32_t STKPeer::getPing() uint32_t STKPeer::getPing()
{ {
if (getConnectedTime() < 3.0f) if (getConnectedTime() < 3.0f)
{
m_average_ping.store(m_enet_peer->roundTripTime);
return 0; return 0;
}
if (NetworkConfig::get()->isServer()) if (NetworkConfig::get()->isServer())
{ {
// Average ping in 5 seconds // Average ping in 5 seconds