summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/train_cmd.cpp4
-rw-r--r--src/vehicle.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 96fd4dd07..43cf9265c 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -3654,10 +3654,6 @@ static void TrainController(Vehicle *v, Vehicle *nomove, bool update_image)
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();
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index f69951e89..95986e061 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -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;