Merge branch 'infrastructure_sharing-sx' into jgrpp

This commit is contained in:
Jonathan G Rennison
2016-01-31 11:46:00 +00:00
3 changed files with 9 additions and 4 deletions

View File

@@ -3248,9 +3248,6 @@ static Vehicle *FindTrainCollideEnum(Vehicle *v, void *data)
/* not a train or in depot */
if (v->type != VEH_TRAIN || Train::From(v)->track == TRACK_BIT_DEPOT) return NULL;
/* do not crash into trains of another company. */
if (v->owner != tcc->v->owner) return NULL;
/* get first vehicle now to make most usual checks faster */
Train *coll = Train::From(v)->First();