# HG changeset patch # User pasky # Date 1112404081 0 # Node ID 24c6310f887b41a4e301df3a66b89fd7703c4ca2 # Parent f6f2c918356d4674961281758c12cd9b09fb9edd (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 -r f6f2c918356d -r 24c6310f887b order.h --- a/order.h Sat Apr 02 00:17:16 2005 +0000 +++ b/order.h Sat Apr 02 01:08:01 2005 +0000 @@ -15,6 +15,8 @@ }; /* 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 @@ 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 @@ OFB_NON_STOP = 3 }; + /* Possible clone options */ enum { CO_SHARE = 0, diff -r f6f2c918356d -r 24c6310f887b train_cmd.c --- a/train_cmd.c Sat Apr 02 00:17:16 2005 +0000 +++ b/train_cmd.c Sat Apr 02 01:08:01 2005 +0000 @@ -1360,7 +1360,7 @@ 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++; }