From a99ac0d0575b3b6849b6de719ac5d5790f018c40 Mon Sep 17 00:00:00 2001 From: dominik Date: Mon, 27 Sep 2004 14:30:17 +0000 Subject: (svn r329) Fix: [ 1035066 ] 'Allow goto depot' turned off, no checkpoints in orders --- order_gui.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'order_gui.c') diff --git a/order_gui.c b/order_gui.c index 54ef8bbe1..4df0fdd1f 100644 --- a/order_gui.c +++ b/order_gui.c @@ -169,9 +169,6 @@ static uint GetOrderCmdFromTile(Vehicle *v, uint tile) if (v->type == VEH_Train && _map_owner[tile] == _local_player) { if ((_map5[tile]&0xFC)==0xC0) return (GetDepotByTile(tile)<<8) | OT_GOTO_DEPOT | OF_UNLOAD; - - if ((_map5[tile]&0xFE)==0xC4) - return (GetCheckpointByTile(tile)<<8) | OT_GOTO_CHECKPOINT; } break; @@ -198,6 +195,13 @@ static uint GetOrderCmdFromTile(Vehicle *v, uint tile) } } + // check checkpoint + if (IS_TILETYPE(tile, MP_RAILWAY) + && v->type == VEH_Train + && _map_owner[tile] == _local_player + && (_map5[tile]&0xFE)==0xC4) + return (GetCheckpointByTile(tile)<<8) | OT_GOTO_CHECKPOINT; + if (IS_TILETYPE(tile, MP_STATION)) { st = DEREF_STATION(st_index = _map2[tile]); -- cgit v1.2.3-54-g00ecf