mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r26625) [1.4] -Backport from trunk:
- Fix: First send packages about new company, then clients joining it to admin port [FS#6025] (r26616)
This commit is contained in:
parent
491b3e3efc
commit
5702b3951c
|
@ -2191,11 +2191,17 @@ void NetworkServerNewCompany(const Company *c, NetworkClientInfo *ci)
|
|||
ci->client_playas = c->index;
|
||||
NetworkUpdateClientInfo(ci->client_id);
|
||||
NetworkSendCommand(0, 0, 0, CMD_RENAME_PRESIDENT, NULL, ci->client_name, c->index);
|
||||
NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, c->index + 1);
|
||||
}
|
||||
|
||||
/* Announce new company on network. */
|
||||
NetworkAdminCompanyInfo(c, true);
|
||||
|
||||
if (ci != NULL) {
|
||||
/* ci is NULL 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
|
||||
and then learn about a possibly joining client (see FS#6025) */
|
||||
NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, c->index + 1);
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* ENABLE_NETWORK */
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <regstr.h>
|
||||
#include <shlobj.h> /* SHGetFolderPath */
|
||||
#include <Shellapi.h>
|
||||
#include <shellapi.h>
|
||||
#include "win32.h"
|
||||
#include "../../core/alloc_func.hpp"
|
||||
#include "../../openttd.h"
|
||||
|
|
Loading…
Reference in New Issue