mirror of https://github.com/OpenTTD/OpenTTD.git
Fix: [AdminPort] #12411 Send Network Welcome Packet to admin port after game creation completed
Welcome moved into OnGameStart
This commit is contained in:
parent
5d43f6d3e1
commit
debd8971f1
|
@ -939,12 +939,6 @@ bool NetworkServerStart()
|
|||
return true;
|
||||
}
|
||||
|
||||
void NetworkServerSendWelcome( void )
|
||||
{
|
||||
/* welcome possibly still connected admins - this can only happen on a dedicated server. */
|
||||
if (_network_dedicated) ServerNetworkAdminSocketHandler::WelcomeAll();
|
||||
}
|
||||
|
||||
/**
|
||||
* Perform tasks when the server is started. This consists of things
|
||||
* like putting the server's client in a valid company and resetting the restart time.
|
||||
|
@ -972,6 +966,9 @@ void NetworkOnGameStart()
|
|||
}
|
||||
|
||||
ShowClientList();
|
||||
} else {
|
||||
/* welcome possibly still connected admins - this can only happen on a dedicated server. */
|
||||
ServerNetworkAdminSocketHandler::WelcomeAll();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -67,7 +67,6 @@ void NetworkServerSendConfigUpdate();
|
|||
void NetworkServerUpdateGameInfo();
|
||||
void NetworkServerShowStatusToConsole();
|
||||
bool NetworkServerStart();
|
||||
void NetworkServerSendWelcome();
|
||||
void NetworkServerNewCompany(const Company *company, NetworkClientInfo *ci);
|
||||
bool NetworkServerChangeClientName(ClientID client_id, const std::string &new_name);
|
||||
|
||||
|
|
|
@ -1202,10 +1202,6 @@ void SwitchToMode(SwitchMode new_mode)
|
|||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
|
||||
if (_is_network_server) {
|
||||
NetworkServerSendWelcome();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue