Fix the search for alternative transports not caring about passenger types

This commit is contained in:
abcdefg30
2016-10-21 13:25:12 +02:00
parent 618cd91cc7
commit cb49583d82

View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Activities
return TryGetAlternateTargetInCircle( return TryGetAlternateTargetInCircle(
self, passenger.Info.AlternateTransportScanRange, self, passenger.Info.AlternateTransportScanRange,
t => { transport = t.Actor; cargo = t.Actor.Trait<Cargo>(); }, // update transport and cargo t => { transport = t.Actor; cargo = t.Actor.Trait<Cargo>(); }, // update transport and cargo
a => { var c = a.TraitOrDefault<Cargo>(); return c != null && (c.Unloading || c.CanLoad(a, self)); }, a => { var c = a.TraitOrDefault<Cargo>(); return c != null && c.Info.Types.Contains(passenger.Info.CargoType) && (c.Unloading || c.CanLoad(a, self)); },
new Func<Actor, bool>[] { a => a.Info.Name == type }); // Prefer transports of the same type new Func<Actor, bool>[] { a => a.Info.Name == type }); // Prefer transports of the same type
} }
} }