mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r14450) -Fix [FS#2337]: time table restoring did check too restrictively causing order backups not to be properly restored.

This commit is contained in:
rubidium 2008-10-08 11:29:17 +00:00
parent 1d2fbbc8a7
commit a34bd150fe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/timetable_cmd.cpp
View File

@ -68,8 +68,8 @@ CommandCost CmdChangeTimetable(TileIndex tile, uint32 flags, uint32 p1, uint32 p
bool packed_time = HasBit(p1, 25); bool packed_time = HasBit(p1, 25);
bool is_journey = HasBit(p1, 24) || packed_time; bool is_journey = HasBit(p1, 24) || packed_time;
int wait_time = -1; int wait_time = order->wait_time;
int travel_time = -1; int travel_time = order->travel_time;
if (packed_time) { if (packed_time) {
travel_time = GB(p2, 0, 16); travel_time = GB(p2, 0, 16);
wait_time = GB(p2, 16, 16);; wait_time = GB(p2, 16, 16);;
@ -79,7 +79,7 @@ CommandCost CmdChangeTimetable(TileIndex tile, uint32 flags, uint32 p1, uint32 p
wait_time = GB(p2, 0, 16); wait_time = GB(p2, 0, 16);
} }
if (wait_time != -1) { if (wait_time != order->wait_time) {
switch (order->GetType()) { switch (order->GetType()) {
case OT_GOTO_STATION: case OT_GOTO_STATION:
if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_TIMETABLE_NOT_STOPPING_HERE); if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_TIMETABLE_NOT_STOPPING_HERE);
@ -92,11 +92,11 @@ CommandCost CmdChangeTimetable(TileIndex tile, uint32 flags, uint32 p1, uint32 p
} }
} }
if (travel_time != -1 && order->IsType(OT_CONDITIONAL)) return CMD_ERROR; if (travel_time != order->travel_time && order->IsType(OT_CONDITIONAL)) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
if (wait_time != -1) ChangeTimetable(v, order_number, wait_time, false); if (wait_time != order->wait_time) ChangeTimetable(v, order_number, wait_time, false);
if (travel_time != -1) ChangeTimetable(v, order_number, travel_time, true); if (travel_time != order->travel_time) ChangeTimetable(v, order_number, travel_time, true);
} }
return CommandCost(); return CommandCost();