epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11577 from obrakmann/fix11454_EnterTransport_using_wrong_transport

Browse Source 
Fix loading wrong transport when using alternate EnterTransport method
This commit is contained in:
Matthias Mailänder
2016-07-09 20:59:42 +02:00
committed by GitHub
parent 57acfe355b ffe36334a0
commit 1fe66526cb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/EnterTransport.cs
View File

@@ -17,9 +17,9 @@ namespace OpenRA.Mods.Common.Activities
{
class EnterTransport : Enter
{
readonly Actor transport;
readonly Passenger passenger;
readonly int maxTries;
Actor transport;
Cargo cargo;
public EnterTransport(Actor self, Actor transport, int maxTries = 0, bool targetCenter = false)
@@ -64,7 +64,7 @@ namespace OpenRA.Mods.Common.Activities
var type = target.Actor.Info.Name;
return TryGetAlternateTargetInCircle(
self, passenger.Info.AlternateTransportScanRange,
t => cargo = t.Actor.Trait<Cargo>(), // update 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)); },
new Func<Actor, bool>[] { a => a.Info.Name == type }); // Prefer transports of the same type
}