mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r785) -Fix: A train can leave and enter the same depot at the same time, then the trai simply got stuck

This commit is contained in:
tron 2004-11-23 20:25:18 +00:00
parent c5b0ecac4f
commit 0b3cceb21d
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
train_cmd.c
View File

@ -1261,18 +1261,11 @@ static void TrainPlayLeaveStationSound(Vehicle *v)
static bool CheckTrainStayInDepot(Vehicle *v)
{
Vehicle *u;
if (v->u.rail.track != 0x80) // first wagon (eg engine) in depot
return false;
// make sure that all vehicles are in the depot
u = GetLastVehicleInChain(v);
if (u->u.rail.track != 0x80)
return false;
// fix hung train if both ends are in depots (when here first wagon and last wagon is in depot)
// both first and last should be in the same depot, eg on the same tile
if (v->tile != u->tile)
return false;
// bail out if not all wagons are in the same depot or not in a depot at all
for (u = v; u != NULL; u = u->next)
if (u->u.rail.track != 0x80 || u->tile != v->tile)
return false;
if (v->u.rail.force_proceed == 0) {
if (++v->load_unload_time_rem < 37)