mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-18 18:02:37 +01:00
Code Issues Releases Wiki Activity

(svn r16597) [0.7] -Backport from trunk:

Browse Source 
- Fix: Also catch FPEs in saveload and the warning about missing NewGRFs; only happens when assertions are disabled and NewGRFs are missing (r16572)
- Fix: In some cases, train could be stuck in depot [FS#2974] (r16571)
- Fix: [NoAI] AIMarine::AreWaterTilesConnected did not return true for bridge head<>neighbouring water tile (r16563)
- Fix: Removing of duplicates of base graphics set could behave randomly (r16548)
This commit is contained in:
rubidium
2009-06-18 22:14:13 +00:00
parent a00a4b5ad8
commit 2d454f37f0
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/train_cmd.cpp
View File

@@ -2387,7 +2387,7 @@ static bool CheckTrainStayInDepot(Vehicle *v)
}
/* We are leaving a depot, but have to go to the exact same one; re-enter */
if (v->tile == v->dest_tile) {
if (v->current_order.IsType(OT_GOTO_DEPOT) && v->tile == v->dest_tile) {
/* We need to have a reservation for this to work. */
if (GetDepotWaypointReservation(v->tile)) return true;
SetDepotWaypointReservation(v->tile, true);