cpp/openttd-patchpack/source Changeset - r10314:db6cfacd8639

Changeset - r10314:db6cfacd8639

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

michi_cc - 16 years ago 2008-11-02 19:32:24
michi_cc@openttd.org

(svn r14559) -Fix [FS#2387]: A train could be blocked inside a depot if it was reversed just after leaving the depot.

2 files changed with 4 insertions and 4 deletions:

src/train_cmd.cpp

src/vehicle.cpp

0 comments (0 inline, 0 general)

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -3654,10 +3654,6 @@ static void TrainController(Vehicle *v, @@
 						TrainEnterStation(v, r >> VETS_STATION_ID_OFFSET);
 						return;
+					}
 					if (v->Next() == NULL && IsRailDepotTile(v->tile) && HasBit(r, VETS_ENTERED_WORMHOLE)) {
 						SetDepotWaypointReservation(v->tile, false);
 						if (_settings_client.gui.show_track_reservation) MarkTileDirtyByTile(v->tile);
+					}
 					if (v->current_order.IsType(OT_LEAVESTATION)) {
 						v->current_order.Free();

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1558,6 +1558,10 @@ void VehicleEnterDepot(Vehicle *v) @@
 	switch (v->type) {
 		case VEH_TRAIN:
 			InvalidateWindowClasses(WC_TRAINS_LIST);
 			/* Clear path reservation */
 			SetDepotWaypointReservation(v->tile, false);
 			if (_settings_client.gui.show_track_reservation) MarkTileDirtyByTile(v->tile);
 			if (!IsFrontEngine(v)) v = v->First();
 			UpdateSignalsOnSegment(v->tile, INVALID_DIAGDIR, v->owner);
 			v->load_unload_time_rem = 0;

0 comments (0 inline, 0 general)