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/timetable_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/timetable_cmd.cpp')
| -rw-r--r-- | src/timetable_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index 2145e89fc..134944109 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -77,7 +77,7 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u VehicleOrderID order_number = GB(p1, 20, 8); Order *order = v->GetOrder(order_number); - if (order == NULL || order->IsType(OT_AUTOMATIC)) return CMD_ERROR; + if (order == NULL || order->IsType(OT_IMPLICIT)) return CMD_ERROR; bool is_journey = HasBit(p1, 28); @@ -241,10 +241,10 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling) v->current_order_time = 0; - if (v->current_order.IsType(OT_AUTOMATIC)) return; // no timetabling of auto orders + if (v->current_order.IsType(OT_IMPLICIT)) return; // no timetabling of auto orders VehicleOrderID first_manual_order = 0; - for (Order *o = v->GetFirstOrder(); o != NULL && o->IsType(OT_AUTOMATIC); o = o->next) { + for (Order *o = v->GetFirstOrder(); o != NULL && o->IsType(OT_IMPLICIT); o = o->next) { ++first_manual_order; } |