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

Fix spectator if network splitscreen is enabled

Browse Source
This commit is contained in:
Benau
2019-02-01 22:12:53 +08:00
parent df2731bc2c
commit 75bc25d2ff
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,7 +278,8 @@ void ClientLobby::addAllPlayers(Event* event)
uint16_t flag_return_timeout = data.getUInt16();
race_manager->setFlagReturnTicks(flag_return_timeout);
}
configRemoteKart(players);
configRemoteKart(players, isSpectator() ? 1 :
(int)NetworkConfig::get()->getNetworkPlayers().size());
loadWorld();
// Disable until render gui during loading is bug free
//StateManager::get()->enterGameState();

6
src/network/protocols/lobby_protocol.cpp
View File

@@ -91,14 +91,14 @@ void LobbyProtocol::loadWorld()
// ----------------------------------------------------------------------------
void LobbyProtocol::configRemoteKart(
const std::vector<std::shared_ptr<NetworkPlayerProfile> >& players) const
const std::vector<std::shared_ptr<NetworkPlayerProfile> >& players,
int local_player_size) const
{
// The number of karts includes the AI karts, which are not supported atm
race_manager->setNumKarts((int)players.size());
// Set number of global and local players.
race_manager->setNumPlayers((int)players.size(),
(int)NetworkConfig::get()->getNetworkPlayers().size());
race_manager->setNumPlayers((int)players.size(), local_player_size);
// Create the kart information for the race manager:
// -------------------------------------------------

3
src/network/protocols/lobby_protocol.hpp
View File

@@ -129,7 +129,8 @@ protected:
// ------------------------------------------------------------------------
void configRemoteKart(
const std::vector<std::shared_ptr<NetworkPlayerProfile> >& players) const;
const std::vector<std::shared_ptr<NetworkPlayerProfile> >& players,
int local_player_size) const;
// ------------------------------------------------------------------------
void joinStartGameThread()
{

2
src/network/protocols/server_lobby.cpp
View File

@@ -603,7 +603,7 @@ void ServerLobby::asynchronousUpdate()
uint16_t flag_return_time = (uint16_t)stk_config->time2Ticks(
ServerConfig::m_flag_return_timemout);
race_manager->setFlagReturnTicks(flag_return_time);
configRemoteKart(players);
configRemoteKart(players, 0);
// Reset for next state usage
resetPeersReady();