cpp/openttd-patchpack/source Changeset - r10227:5c84b06816db

Changeset - r10227:5c84b06816db

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 16 years ago 2008-10-08 11:29:17
rubidium@openttd.org

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

1 file changed with 6 insertions and 6 deletions:

src/timetable_cmd.cpp

0 comments (0 inline, 0 general)

src/timetable_cmd.cpp

➞

Show inline comments

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

0 comments (0 inline, 0 general)