diff options
| author | skidd13 <skidd13@openttd.org> | 2007-11-19 21:02:30 +0000 |
|---|---|---|
| committer | skidd13 <skidd13@openttd.org> | 2007-11-19 21:02:30 +0000 |
| commit | 71c4325c50ae594a5adf01cac7c9e527b239cdcb (patch) | |
| tree | 21212e0b25777aac62f30d88b981e2bd624c4616 /src/timetable_cmd.cpp | |
| parent | 58bb5c752568f8f9a1cb4d9533268d0ecad34e12 (diff) | |
| download | openttd-71c4325c50ae594a5adf01cac7c9e527b239cdcb.tar.xz | |
(svn r11481) -Codechange: Rename the HASBIT function to fit with the naming style
Diffstat (limited to 'src/timetable_cmd.cpp')
| -rw-r--r-- | src/timetable_cmd.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index 0db355978..b5ebecff8 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -23,7 +23,7 @@ static void ChangeTimetable(Vehicle *v, VehicleOrderID order_number, uint16 time order->wait_time = time; } - if (v->cur_order_index == order_number && HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) { + if (v->cur_order_index == order_number && HasBit(v->current_order.flags, OFB_PART_OF_ORDERS)) { if (is_journey) { v->current_order.travel_time = time; } else { @@ -61,7 +61,7 @@ CommandCost CmdChangeTimetable(TileIndex tile, uint32 flags, uint32 p1, uint32 p Order *order = GetVehicleOrder(v, order_number); if (order == NULL) return CMD_ERROR; - bool is_journey = HASBIT(p1, 24); + bool is_journey = HasBit(p1, 24); if (!is_journey) { if (order->type != OT_GOTO_STATION) return_cmd_error(STR_TIMETABLE_ONLY_WAIT_AT_STATIONS); if (_patches.new_nonstop && (order->flags & OF_NON_STOP)) return_cmd_error(STR_TIMETABLE_NOT_STOPPING_HERE); @@ -154,14 +154,14 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling) /* Make sure the timetable only starts when the vehicle reaches the first * order, not when travelling from the depot to the first station. */ - if (v->cur_order_index == 0 && !HASBIT(v->vehicle_flags, VF_TIMETABLE_STARTED)) { + if (v->cur_order_index == 0 && !HasBit(v->vehicle_flags, VF_TIMETABLE_STARTED)) { SETBIT(v->vehicle_flags, VF_TIMETABLE_STARTED); return; } - if (!HASBIT(v->vehicle_flags, VF_TIMETABLE_STARTED)) return; + if (!HasBit(v->vehicle_flags, VF_TIMETABLE_STARTED)) return; - if (HASBIT(v->vehicle_flags, VF_AUTOFILL_TIMETABLE)) { + if (HasBit(v->vehicle_flags, VF_AUTOFILL_TIMETABLE)) { if (timetabled == 0) { /* Round the time taken up to the nearest day, as this will avoid * confusion for people who are timetabling in days, and can be |