summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2008-03-05 22:05:22 +0000
committerglx <glx@openttd.org>2008-03-05 22:05:22 +0000
commit1976d2d37cf6854c8551c4c0116df55e6cf09455 (patch)
tree0dd8d39e68bc80694b8f5d4892202e17d09ac625 /src
parent442efcffb018959a3cdcce564a04584047b07025 (diff)
downloadopenttd-1976d2d37cf6854c8551c4c0116df55e6cf09455.tar.xz
(svn r12345) -Fix [FS#1828](r12296): don't try to restore backupped timetable when timetabling is disabled
Diffstat (limited to 'src')
-rw-r--r--src/order_cmd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp
index b83c1c93d..2085fb1f9 100644
--- a/src/order_cmd.cpp
+++ b/src/order_cmd.cpp
@@ -997,8 +997,8 @@ void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *bak)
break;
}
- /* Copy timetable */
- if (!DoCommandP(0, v->index | (i << 16) | (1 << 25),
+ /* Copy timetable if enabled */
+ if (_patches.timetabling && !DoCommandP(0, v->index | (i << 16) | (1 << 25),
bak->order[i].wait_time << 16 | bak->order[i].travel_time, NULL,
CMD_CHANGE_TIMETABLE | CMD_NO_TEST_IF_IN_NETWORK)) {
break;