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

Fix local game crash

Browse Source
This commit is contained in:
Benau
2020-02-11 12:58:12 +08:00
parent e0f494abcd
commit acdf77baf9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/modes/world.cpp
View File

@@ -468,8 +468,9 @@ std::shared_ptr<AbstractKart> World::createKart
{
case RaceManager::KT_PLAYER:
{
int local_player_count = -1;
if (NetworkConfig::get()->isClient())
int local_player_count = 99999;
if (NetworkConfig::get()->isNetworking() &&
NetworkConfig::get()->isClient())
{
local_player_count =
(int)NetworkConfig::get()->getNetworkPlayers().size();

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

@@ -3522,9 +3522,10 @@ void ServerLobby::handleUnencryptedConnection(std::shared_ptr<STKPeer> peer,
if (m_ai_profiles.empty() && peer->getAddress().isLoopback())
{
unsigned ai_add = NetworkConfig::get()->getNumFixedAI();
unsigned max_players = ServerConfig::m_server_max_players;
// We need to reserve at least 1 slot for new player
if (player_count + ai_add + 1 > ServerConfig::m_server_max_players)
ai_add = ServerConfig::m_server_max_players - player_count - 1;
if (player_count + ai_add + 1 > max_players)
ai_add = max_players - player_count - 1;
for (unsigned i = 0; i < ai_add; i++)
{
#ifdef SERVER_ONLY