diff options
author | planetmaker <planetmaker@openttd.org> | 2011-05-18 12:19:58 +0000 |
---|---|---|
committer | planetmaker <planetmaker@openttd.org> | 2011-05-18 12:19:58 +0000 |
commit | 43c8cd1d5e7d0fa2b7e369eac0239a41ae6c0bb1 (patch) | |
tree | 2c682c0fff6be31263f2d3670e6bf718d86b3f4a /src/train_cmd.cpp | |
parent | bc6b348e7a67b758fd4de5268941226380e5be24 (diff) | |
download | openttd-43c8cd1d5e7d0fa2b7e369eac0239a41ae6c0bb1.tar.xz |
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
Diffstat (limited to 'src/train_cmd.cpp')
-rw-r--r-- | src/train_cmd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 92ee36e30..35ded7fdf 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2292,7 +2292,7 @@ private: TileIndex old_dest_tile; StationID old_last_station_visited; VehicleOrderID index; - bool suppress_automatic_orders; + bool suppress_implicit_orders; public: VehicleOrderSaver(Train *_v) : @@ -2301,7 +2301,7 @@ public: old_dest_tile(_v->dest_tile), old_last_station_visited(_v->last_station_visited), index(_v->cur_real_order_index), - suppress_automatic_orders(HasBit(_v->gv_flags, GVF_SUPPRESS_AUTOMATIC_ORDERS)) + suppress_implicit_orders(HasBit(_v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS)) { } @@ -2310,7 +2310,7 @@ public: this->v->current_order = this->old_order; this->v->dest_tile = this->old_dest_tile; this->v->last_station_visited = this->old_last_station_visited; - SB(this->v->gv_flags, GVF_SUPPRESS_AUTOMATIC_ORDERS, 1, suppress_automatic_orders ? 1: 0); + SB(this->v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS, 1, suppress_implicit_orders ? 1: 0); } /** @@ -3770,7 +3770,7 @@ static void CheckIfTrainNeedsService(Train *v) return; } - SetBit(v->gv_flags, GVF_SUPPRESS_AUTOMATIC_ORDERS); + SetBit(v->gv_flags, GVF_SUPPRESS_IMPLICIT_ORDERS); v->current_order.MakeGoToDepot(depot, ODTFB_SERVICE); v->dest_tile = tfdd.tile; SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); |