diff options
| author | michi_cc <michi_cc@openttd.org> | 2012-02-14 17:04:06 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2012-02-14 17:04:06 +0000 |
| commit | f2c694c8fbfb775dc239ab1c6447d3744d1c84c7 (patch) | |
| tree | af7e8b3e3689ad2e9e0db8ef56a8c7ea7521b373 /src/timetable_cmd.cpp | |
| parent | 347157cb8ce016428275d6143b555de1dc802133 (diff) | |
| download | openttd-f2c694c8fbfb775dc239ab1c6447d3744d1c84c7.tar.xz | |
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
Diffstat (limited to 'src/timetable_cmd.cpp')
| -rw-r--r-- | src/timetable_cmd.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index d360d8190..5be51c37b 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -42,6 +42,10 @@ static void ChangeTimetable(Vehicle *v, VehicleOrderID order_number, uint16 val, order->travel_time = val; break; + case MTF_TRAVEL_SPEED: + order->max_speed = val; + break; + default: NOT_REACHED(); } @@ -58,6 +62,10 @@ static void ChangeTimetable(Vehicle *v, VehicleOrderID order_number, uint16 val, v->current_order.travel_time = val; break; + case MTF_TRAVEL_SPEED: + v->current_order.max_speed = val; + break; + default: NOT_REACHED(); } @@ -98,6 +106,7 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u int wait_time = order->wait_time; int travel_time = order->travel_time; + int max_speed = order->max_speed; switch (mtf) { case MTF_WAIT_TIME: wait_time = GB(p2, 0, 16); @@ -107,6 +116,10 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u travel_time = GB(p2, 0, 16); break; + case MTF_TRAVEL_SPEED: + max_speed = GB(p2, 0, 16); + break; + default: NOT_REACHED(); } @@ -125,10 +138,12 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u } if (travel_time != order->travel_time && order->IsType(OT_CONDITIONAL)) return CMD_ERROR; + if (max_speed != order->max_speed && (order->IsType(OT_CONDITIONAL) || v->type == VEH_AIRCRAFT)) return CMD_ERROR; if (flags & DC_EXEC) { if (wait_time != order->wait_time) ChangeTimetable(v, order_number, wait_time, MTF_WAIT_TIME); if (travel_time != order->travel_time) ChangeTimetable(v, order_number, travel_time, MTF_TRAVEL_TIME); + if (max_speed != order->max_speed) ChangeTimetable(v, order_number, max_speed, MTF_TRAVEL_SPEED); } return CommandCost(); |