petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r1710) - Fix: [autoreplace] vehicles do no longer go to a depot all the time if the owner clicked 'stop replacing' ( ship+aircraft+road vehicles )

Browse Source
This commit is contained in:
bjarni
2005-01-29 01:02:47 +00:00
parent 27cd24c316
commit db4721a31d
3 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ship_cmd.c
View File

@@ -299,6 +299,13 @@ static void HandleShipLoading(Vehicle *v)
DoCommandP(v->tile, v->index, flags, NULL, CMD_SEND_SHIP_TO_DEPOT | CMD_SHOW_NO_ERROR);
_current_player = OWNER_NONE;
}
} else { // no need to go to a depot
if (v->set_for_replacement) {
// it seems that the user clicked "Stop replacing"
_current_player = _local_player;
DoCommandP(v->tile, v->index, 1 | (1 << 2), NULL, CMD_SEND_SHIP_TO_DEPOT | CMD_SHOW_NO_ERROR);
_current_player = OWNER_NONE;
}
}
}
if (!(b.flags & OF_NON_STOP))
@@ -949,7 +956,9 @@ int32 CmdStartStopShip(int x, int y, uint32 flags, uint32 p1, uint32 p2)
/* Send a ship to the nearest depot
p1 = index of the ship
p2 = bit 0 = do not stop in depot, bit 1 = have depot in orders */
p2 = bit 0 = do not stop in depot
bit 1 = set v->set_for_replacement
bit 2 = clear v->set_for_replacement */
int32 CmdSendShipToDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2)
{
Vehicle *v;
@@ -961,8 +970,9 @@ int32 CmdSendShipToDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2)
return CMD_ERROR;
if (HASBIT(p2, 0)) v->set_for_replacement = true;
if (HASBIT(p2, 2)) v->set_for_replacement = false;
if (HASBIT(p2, 1)) return CMD_ERROR; // vehicle has a depot in schedule. It just needed to set set_for_replacement
if (HASBIT(p2, 1) || HASBIT(p2, 2)) return CMD_ERROR; // vehicle has a depot in schedule. It just needed to alter set_for_replacement
if (v->current_order.type == OT_GOTO_DEPOT) {
if (flags & DC_EXEC) {