summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-08-10 21:56:47 +0000
committerrubidium <rubidium@openttd.org>2008-08-10 21:56:47 +0000
commit8726c2fd998b2c1f3f8020c9bd94904603b7e5a8 (patch)
tree2e36442017c9adc7289659c972b56c53ac66f37d /src
parent2086f77daba836dc6cdb5204060adbca8e7377f3 (diff)
downloadopenttd-8726c2fd998b2c1f3f8020c9bd94904603b7e5a8.tar.xz
(svn r14039) -Fix [FS#2217]: reversing an overlength train at a station would try to find a route out and sometimes reset the unload counter making it wait 2.5 years before departing instead of waiting until the train would actually leave the station (michi_cc)
Diffstat (limited to 'src')
-rw-r--r--src/train_cmd.cpp5
-rw-r--r--src/vehicle.cpp12
2 files changed, 14 insertions, 3 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 1ecdff208..8bb89bd6f 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -1950,9 +1950,12 @@ static void ReverseTrainDirection(Vehicle *v)
!IsPbsSignal(GetSignalType(v->tile, FindFirstTrack(v->u.rail.track))));
if (IsRailwayStationTile(v->tile)) SetRailwayStationPlatformReservation(v->tile, TrackdirToExitdir(GetVehicleTrackdir(v)), true);
- if (TryPathReserve(v, true, first_tile_okay)) {
+ if (TryPathReserve(v, false, first_tile_okay)) {
/* Do a look-ahead now in case our current tile was already a safe tile. */
CheckNextTrainTile(v);
+ } else if (v->current_order.GetType() != OT_LOADING) {
+ /* Do not wait for a way out when we're still loading */
+ MarkTrainAsStuck(v);
}
}
}
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 555f1ddf0..305544137 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2345,8 +2345,16 @@ void Vehicle::LeaveStation()
HideFillingPercent(this->fill_percent_te_id);
this->fill_percent_te_id = INVALID_TE_ID;
- /* Trigger station animation for trains only */
- if (this->type == VEH_TRAIN && IsTileType(this->tile, MP_STATION)) StationAnimationTrigger(st, this->tile, STAT_ANIM_TRAIN_DEPARTS);
+ if (this->type == VEH_TRAIN) {
+ /* Trigger station animation (trains only) */
+ if (IsTileType(this->tile, MP_STATION)) StationAnimationTrigger(st, this->tile, STAT_ANIM_TRAIN_DEPARTS);
+
+ /* Try to reserve a path when leaving the station as we
+ * might not be marked as wanting a reservation, e.g.
+ * when an overlenght train gets turned around in a station.
+ */
+ TryPathReserve(this, true, true);
+ }
}