diff -r eee46cb39750 -r b39bc69bb2f2 src/timetable_cmd.cpp --- a/src/timetable_cmd.cpp Wed Jan 09 18:11:12 2008 +0000 +++ b/src/timetable_cmd.cpp Sun Feb 03 20:17:54 2008 +0000 @@ -5,14 +5,14 @@ #include "stdafx.h" #include "openttd.h" #include "variables.h" -#include "table/strings.h" #include "command_func.h" -#include "player.h" #include "functions.h" #include "window_func.h" #include "vehicle_func.h" #include "vehicle_base.h" +#include "settings_type.h" +#include "table/strings.h" static void ChangeTimetable(Vehicle *v, VehicleOrderID order_number, uint16 time, bool is_journey) { @@ -24,7 +24,7 @@ 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, OF_PART_OF_ORDERS)) { if (is_journey) { v->current_order.travel_time = time; } else { @@ -65,7 +65,7 @@ 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); + if (_patches.new_nonstop && (order->flags & OFB_NON_STOP)) return_cmd_error(STR_TIMETABLE_NOT_STOPPING_HERE); } if (flags & DC_EXEC) {