|
@@ -573,10 +573,8 @@ bool DoCommandP(TileIndex tile, uint32 p
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
#ifdef ENABLE_NETWORK
|
|
|
/* Only set p2 when the command does not come from the network. */
|
|
|
if (!(cmd & CMD_NETWORK_COMMAND) && GetCommandFlags(cmd) & CMD_CLIENT_ID && p2 == 0) p2 = CLIENT_ID_SERVER;
|
|
|
#endif
|
|
|
|
|
|
CommandCost res = DoCommandPInternal(tile, p1, p2, cmd, callback, text, my_cmd, estimate_only);
|
|
|
if (res.Failed()) {
|
|
@@ -646,10 +644,8 @@ CommandCost DoCommandPInternal(TileIndex
|
|
|
/* Flags get send to the DoCommand */
|
|
|
DoCommandFlag flags = CommandFlagsToDCFlags(cmd_flags);
|
|
|
|
|
|
#ifdef ENABLE_NETWORK
|
|
|
/* Make sure p2 is properly set to a ClientID. */
|
|
|
assert(!(cmd_flags & CMD_CLIENT_ID) || p2 != 0);
|
|
|
#endif
|
|
|
|
|
|
/* Do not even think about executing out-of-bounds tile-commands */
|
|
|
if (tile != 0 && (tile >= MapSize() || (!IsValidTile(tile) && (cmd_flags & CMD_ALL_TILES) == 0))) return_dcpi(CMD_ERROR);
|
|
@@ -696,7 +692,6 @@ CommandCost DoCommandPInternal(TileIndex
|
|
|
return_dcpi(res);
|
|
|
}
|
|
|
|
|
|
#ifdef ENABLE_NETWORK
|
|
|
/*
|
|
|
* If we are in network, and the command is not from the network
|
|
|
* send it to the command-queue and abort execution
|
|
@@ -711,7 +706,6 @@ CommandCost DoCommandPInternal(TileIndex
|
|
|
* reset the storages as we've not executed the command. */
|
|
|
return_dcpi(CommandCost());
|
|
|
}
|
|
|
#endif /* ENABLE_NETWORK */
|
|
|
DEBUG(desync, 1, "cmd: %08x; %02x; %02x; %06x; %08x; %08x; %08x; \"%s\" (%s)", _date, _date_fract, (int)_current_company, tile, p1, p2, cmd & ~CMD_NETWORK_COMMAND, text, GetCommandName(cmd));
|
|
|
|
|
|
/* Actually try and execute the command. If no cost-type is given
|