From e39484e9a8c2ddf93bce5b9ec5bc570c415c6000 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 8 Jan 2009 14:55:28 +0000 Subject: (svn r14916) -Codechange: make it possible to send CommandContainers directly to DoCommand(P). --- src/network/network_command.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/network/network_command.cpp') diff --git a/src/network/network_command.cpp b/src/network/network_command.cpp index 52f680aaa..4adeb92f6 100644 --- a/src/network/network_command.cpp +++ b/src/network/network_command.cpp @@ -92,16 +92,6 @@ void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, Comma SEND_COMMAND(PACKET_CLIENT_COMMAND)(&c); } -/** - * Execute a DoCommand we received from the network - * @param cp the command to execute - */ -static void NetworkExecuteCommand(CommandPacket *cp) -{ - _current_company = cp->company; - DoCommandP(cp->tile, cp->p1, cp->p2, cp->cmd | CMD_NETWORK_COMMAND, cp->callback, cp->text, cp->my_cmd); -} - /** * Execute all commands on the local command queue that ought to be executed this frame. */ @@ -119,10 +109,13 @@ void NetworkExecuteLocalCommandQueue() error("[net] Trying to execute a packet in the past!"); } + CommandPacket *cp = _local_command_queue; + /* We can execute this command */ - NetworkExecuteCommand(_local_command_queue); + _current_company = cp->company; + cp->cmd |= CMD_NETWORK_COMMAND; + DoCommandP(cp, cp->my_cmd); - CommandPacket *cp = _local_command_queue; _local_command_queue = _local_command_queue->next; free(cp); } -- cgit v1.2.3-54-g00ecf