# HG changeset patch # User pasky # Date 2005-04-02 01:08:01 # Node ID 6d516e05db7d9ff3f17a40a9f8ecf5d65186b0ae # Parent e8a71ea30aa544dd258a1d50400329773ae83baa (svn r2119) - Fix: [ 1172878 ] Trains "Go to depot" button: click twice skip to next order (patch by Loic GUILLOUX). I also added short explanation of OF_/OFB_ difference to order.h. diff --git a/order.h b/order.h --- a/order.h +++ b/order.h @@ -15,6 +15,8 @@ enum { }; /* Order flags -- please use OFB instead OF and use HASBIT/SETBIT/CLEARBIT */ + +/* Order flag masks - these are for direct bit operations */ enum { //Flags for stations: OF_UNLOAD = 0x2, @@ -28,7 +30,7 @@ enum { OF_NON_STOP = 0x8 }; -/* Order flags bits */ +/* Order flags bits - these are for the *BIT macros */ enum { OFB_UNLOAD = 1, OFB_FULL_LOAD = 2, @@ -37,6 +39,7 @@ enum { OFB_NON_STOP = 3 }; + /* Possible clone options */ enum { CO_SHARE = 0, diff --git a/train_cmd.c b/train_cmd.c --- a/train_cmd.c +++ b/train_cmd.c @@ -1360,7 +1360,7 @@ int32 CmdTrainGotoDepot(int x, int y, ui if (v->current_order.type == OT_GOTO_DEPOT) { if (flags & DC_EXEC) { - if (HASBIT(v->current_order.flags, OF_PART_OF_ORDERS)) { + if (HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) { v->u.rail.days_since_order_progr = 0; v->cur_order_index++; }