diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/network_client.cpp | 2 | ||||
| -rw-r--r-- | src/network/network_command.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index c7029e8f4..dd9f2a7f8 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -643,7 +643,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP) * the server will give us a client-id and let us in */ _network_join_status = NETWORK_JOIN_STATUS_REGISTERING; ShowJoinStatusWindow(); - NetworkSend_Command(0, 0, 0, CMD_COMPANY_CTRL, NULL, NULL); + NetworkSend_Command(0, 0, 0, CMD_COMPANY_CTRL, NULL, NULL, _local_company); } } else { /* take control over an existing company */ diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp index 9a6a064b5..834d28da4 100644 --- a/src/network/network_command.cpp +++ b/src/network/network_command.cpp @@ -78,13 +78,14 @@ void NetworkAddCommandQueue(CommandPacket cp, NetworkClientSocket *cs) * @param cmd The command to execute (a CMD_* value) * @param callback A callback function to call after the command is finished * @param text The text to pass + * @param company The company that wants to send the command */ -void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback, const char *text) +void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback, const char *text, CompanyID company) { assert((cmd & CMD_FLAGS_MASK) == 0); CommandPacket c; - c.company = _local_company; + c.company = company; c.next = NULL; c.tile = tile; c.p1 = p1; |