summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-01-11 20:32:32 +0000
committerrubidium <rubidium@openttd.org>2010-01-11 20:32:32 +0000
commitebe99fd4935d54466730095e7a9f239181d5ba7b (patch)
treeadaacb8e6827eaad9ad49c81905a04dca0bf8c21 /src/network
parent3e5a87a52cc8355a2a5c2831c60643bf30d41a3a (diff)
downloadopenttd-ebe99fd4935d54466730095e7a9f239181d5ba7b.tar.xz
(svn r18784) -Codechange: make NetworkSend_Command accept a company instead of using _local_company to pass that information, with the whole mess when you don't want the company to be _local_company.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/network_client.cpp2
-rw-r--r--src/network/network_command.cpp5
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;