From 1a852b7f2264df2909171e9f44b79f6e58850372 Mon Sep 17 00:00:00 2001 From: Benau Date: Fri, 16 Mar 2018 21:32:12 +0800 Subject: [PATCH] configRemoteKart needs to include the random kart --- src/network/protocols/server_lobby.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/network/protocols/server_lobby.cpp b/src/network/protocols/server_lobby.cpp index 7c0181007..84bb381da 100644 --- a/src/network/protocols/server_lobby.cpp +++ b/src/network/protocols/server_lobby.cpp @@ -325,14 +325,6 @@ void ServerLobby::asynchronousUpdate() // Remove disconnected player (if any) one last time m_game_setup->update(true); auto players = m_game_setup->getConnectedPlayers(); - // TODO: sort players for grand prix here - configRemoteKart(players); - // Reset for next state usage - for (auto p : m_peers_ready) - { - p.second = false; - } - m_state = LOAD_WORLD; NetworkString* load_world = getNetworkString(); load_world->setSynchronous(true); load_world->addUInt8(LE_LOAD_WORLD).encodeString(std::get<0>(result)) @@ -355,6 +347,15 @@ void ServerLobby::asynchronousUpdate() } load_world->encodeString(player->getKartName()); } + // TODO: sort players for grand prix here + configRemoteKart(players); + + // Reset for next state usage + for (auto p : m_peers_ready) + { + p.second = false; + } + m_state = LOAD_WORLD; sendMessageToPeersChangingToken(load_world); delete load_world; }