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

Allow using --auto-connect with network ai tester

Browse Source
This commit is contained in:
Benau
2018-09-16 19:19:42 +08:00
parent b3bffacb40
commit 8cb5e43bad
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/karts/controller/network_ai_controller.cpp
View File

@@ -43,6 +43,7 @@ NetworkAIController::NetworkAIController(AbstractKart *kart,
// ----------------------------------------------------------------------------
NetworkAIController::~NetworkAIController()
{
delete m_ai_controller;
delete m_ai_controls;
} // ~NetworkAIController

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

@@ -376,6 +376,14 @@ void ClientLobby::update(int ticks)
break;
case REQUESTING_CONNECTION:
case CONNECTED:
if (STKHost::get()->isAuthorisedToControl() &&
NetworkConfig::get()->isAutoConnect())
{
// Send a message to the server to start
NetworkString start(PROTOCOL_LOBBY_ROOM);
start.addUInt8(LobbyProtocol::LE_REQUEST_BEGIN);
STKHost::get()->sendToServer(&start, true);
}
case SELECTING_ASSETS:
case RACING:
case EXITING:
@@ -709,15 +717,6 @@ void ClientLobby::handleBadConnection()
void ClientLobby::becomingServerOwner()
{
STKHost::get()->setAuthorisedToControl(true);
if (m_state.load() == CONNECTED && NetworkConfig::get()->isAutoConnect())
{
// Send a message to the server to start
NetworkString start(PROTOCOL_LOBBY_ROOM);
start.setSynchronous(true);
start.addUInt8(LobbyProtocol::LE_REQUEST_BEGIN);
STKHost::get()->sendToServer(&start, true);
}
if (STKHost::get()->isClientServer())
return;