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

Enable live join only when no game protocols

Browse Source
This commit is contained in:
Benau 2019-05-14 09:05:46 +08:00
parent 45cafe9984
commit b79151c760
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/states_screens/online/networking_lobby.cpp
View File

@ -36,8 +36,10 @@
#include "input/input_manager.hpp" #include "input/input_manager.hpp"
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
#include "network/game_setup.hpp" #include "network/game_setup.hpp"
#include "network/race_event_manager.hpp"
#include "network/network_config.hpp" #include "network/network_config.hpp"
#include "network/protocols/connect_to_server.hpp" #include "network/protocols/connect_to_server.hpp"
#include "network/protocols/game_protocol.hpp"
#include "network/protocols/client_lobby.hpp" #include "network/protocols/client_lobby.hpp"
#include "network/server.hpp" #include "network/server.hpp"
#include "network/stk_host.hpp" #include "network/stk_host.hpp"
@ -371,10 +373,13 @@ void NetworkingLobby::onUpdate(float delta)
} }
// You can live join or spectator if u have the current play track // You can live join or spectator if u have the current play track
// and network timer is synchronized // and network timer is synchronized, and no game protocols exist
bool no_gep = !RaceEventManager::getInstance() ||
RaceEventManager::getInstance()->protocolStopped();
bool no_gp = GameProtocol::emptyInstance();
if (t && if (t &&
STKHost::get()->getNetworkTimerSynchronizer()->isSynchronised() && STKHost::get()->getNetworkTimerSynchronizer()->isSynchronised() &&
cl->isServerLiveJoinable()) cl->isServerLiveJoinable() && no_gep && no_gp)
{ {
m_client_live_joinable = true; m_client_live_joinable = true;
} }