dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #10983: [AdminPort] Correct order of messages

Browse Source 
(cherry picked from commit 49c3215751)
This commit is contained in:
Damian Laczak
2023-06-26 02:11:04 +02:00
committed by Jonathan G Rennison
parent 5c35a87ed7
commit 2aa574a48f
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/network_admin.cpp
View File

@@ -864,11 +864,10 @@ void NetworkAdminClientError(ClientID client_id, NetworkErrorCode error_code)
}
/**
* Notify the admin network of company details.
* Notify the admin network of a new company.
* @param company the company of which details will be sent into the admin network.
* @param new_company whether this is a new company or not.
*/
void NetworkAdminCompanyInfo(const Company *company, bool new_company)
void NetworkAdminCompanyNew(const Company *company)
{
if (company == nullptr) {
DEBUG(net, 1, "[admin] Empty company given for update");
@@ -878,10 +877,8 @@ void NetworkAdminCompanyInfo(const Company *company, bool new_company)
for (ServerNetworkAdminSocketHandler *as : ServerNetworkAdminSocketHandler::IterateActive()) {
if (as->update_frequency[ADMIN_UPDATE_COMPANY_INFO] != ADMIN_FREQUENCY_AUTOMATIC) continue;
as->SendCompanyNew(company->index);
as->SendCompanyInfo(company);
if (new_company) {
as->SendCompanyNew(company->index);
}
}
}

2
src/network/network_admin.h
View File

@@ -103,7 +103,7 @@ void NetworkAdminClientInfo(const NetworkClientSocket *cs, bool new_client = fal
void NetworkAdminClientUpdate(const NetworkClientInfo *ci);
void NetworkAdminClientQuit(ClientID client_id);
void NetworkAdminClientError(ClientID client_id, NetworkErrorCode error_code);
void NetworkAdminCompanyInfo(const Company *company, bool new_company);
void NetworkAdminCompanyNew(const Company *company);
void NetworkAdminCompanyUpdate(const Company *company);
void NetworkAdminCompanyRemove(CompanyID company_id, AdminCompanyRemoveReason bcrr);

3
src/network/network_server.cpp
View File

@@ -2454,9 +2454,6 @@ void NetworkServerNewCompany(const Company *c, NetworkClientInfo *ci)
NetworkSendCommand(0, 0, 0, 0, CMD_RENAME_PRESIDENT, nullptr, ci->client_name.c_str(), c->index, nullptr);
}
/* Announce new company on network. */
NetworkAdminCompanyInfo(c, true);
if (ci != nullptr) {
/* ci is nullptr when replaying, or for AIs. In neither case there is a client.
We need to send Admin port update here so that they first know about the new company