diff options
| author | rubidium <rubidium@openttd.org> | 2008-08-03 08:25:26 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-08-03 08:25:26 +0000 |
| commit | 6639c496c3c8ba5297d4ee979cb14a1bfebf3058 (patch) | |
| tree | a8719e48154e90964346575607ef6ab141507cbc /src/timetable_cmd.cpp | |
| parent | 13dee60ae1a37194a26b1a058d88ebe409df5fff (diff) | |
| download | openttd-6639c496c3c8ba5297d4ee979cb14a1bfebf3058.tar.xz | |
(svn r13972) -Fix [FS#2180]: the timetable's "Clear Time" button didn't have any effect.
Diffstat (limited to 'src/timetable_cmd.cpp')
| -rw-r--r-- | src/timetable_cmd.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp index 03217a809..74f7c5cdb 100644 --- a/src/timetable_cmd.cpp +++ b/src/timetable_cmd.cpp @@ -69,8 +69,8 @@ CommandCost CmdChangeTimetable(TileIndex tile, uint32 flags, uint32 p1, uint32 p bool packed_time = HasBit(p1, 25); bool is_journey = HasBit(p1, 24) || packed_time; - uint16 wait_time = 0; - uint16 travel_time = 0; + int wait_time = -1; + int travel_time = -1; if (packed_time) { travel_time = GB(p2, 0, 16); wait_time = GB(p2, 16, 16);; @@ -80,7 +80,7 @@ CommandCost CmdChangeTimetable(TileIndex tile, uint32 flags, uint32 p1, uint32 p wait_time = GB(p2, 0, 16); } - if (wait_time != 0) { + if (wait_time != -1) { switch (order->GetType()) { case OT_GOTO_STATION: if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_TIMETABLE_NOT_STOPPING_HERE); @@ -93,11 +93,11 @@ CommandCost CmdChangeTimetable(TileIndex tile, uint32 flags, uint32 p1, uint32 p } } - if (travel_time != 0 && order->IsType(OT_CONDITIONAL)) return CMD_ERROR; + if (travel_time != -1 && order->IsType(OT_CONDITIONAL)) return CMD_ERROR; if (flags & DC_EXEC) { - if (wait_time != 0) ChangeTimetable(v, order_number, wait_time, false); - if (travel_time != 0) ChangeTimetable(v, order_number, travel_time, true); + if (wait_time != -1) ChangeTimetable(v, order_number, wait_time, false); + if (travel_time != -1) ChangeTimetable(v, order_number, travel_time, true); } return CommandCost(); |