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

remove some plenks

Browse Source 
no logic changes
This commit is contained in:
Matthias Mailänder
2013-06-18 20:00:56 +02:00
parent 66383a57d1
commit b7f1711497
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Mods.RA/Cargo.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA
List<Actor> cargo = new List<Actor>(); List<Actor> cargo = new List<Actor>();
public IEnumerable<Actor> Passengers { get { return cargo; } } public IEnumerable<Actor> Passengers { get { return cargo; } }
public Cargo( ActorInitializer init, CargoInfo info ) public Cargo(ActorInitializer init, CargoInfo info)
{ {
this.self = init.self; this.self = init.self;
this.info = info; this.info = info;
@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA
if (init.Contains<CargoInit>()) if (init.Contains<CargoInit>())
{ {
cargo = init.Get<CargoInit,Actor[]>().ToList(); cargo = init.Get<CargoInit,Actor[]>().ToList();
totalWeight = cargo.Sum( c => GetWeight(c) ); totalWeight = cargo.Sum(c => GetWeight(c));
} }
else else
{ {
@@ -56,20 +56,20 @@ namespace OpenRA.Mods.RA
new TypeDictionary { new OwnerInit(self.Owner) }); new TypeDictionary { new OwnerInit(self.Owner) });
if (CanLoad(self, unit)) if (CanLoad(self, unit))
Load(self,unit); Load(self, unit);
} }
} }
} }
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
{ {
get { yield return new DeployOrderTargeter( "Unload", 10, () => CanUnload( self ) ); } get { yield return new DeployOrderTargeter("Unload", 10, () => CanUnload(self)); }
} }
public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued ) public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
{ {
if( order.OrderID == "Unload" ) if (order.OrderID == "Unload")
return new Order( order.OrderID, self, queued ); return new Order(order.OrderID, self, queued);
return null; return null;
} }
@@ -135,8 +135,8 @@ namespace OpenRA.Mods.RA
cargo.RemoveAt(0); cargo.RemoveAt(0);
totalWeight -= GetWeight(a); totalWeight -= GetWeight(a);
foreach( var npe in self.TraitsImplementing<INotifyPassengerExited>() ) foreach (var npe in self.TraitsImplementing<INotifyPassengerExited>())
npe.PassengerExited( self, a ); npe.PassengerExited(self, a);
return a; return a;
} }
@@ -170,8 +170,8 @@ namespace OpenRA.Mods.RA
cargo.Add(a); cargo.Add(a);
totalWeight += GetWeight(a); totalWeight += GetWeight(a);
foreach( var npe in self.TraitsImplementing<INotifyPassengerEntered>() ) foreach (var npe in self.TraitsImplementing<INotifyPassengerEntered>())
npe.PassengerEntered( self, a ); npe.PassengerEntered(self, a);
} }
public void Killed(Actor self, AttackInfo e) public void Killed(Actor self, AttackInfo e)
@@ -201,7 +201,7 @@ namespace OpenRA.Mods.RA
{ {
[FieldFromYamlKey] public readonly Actor[] value = {}; [FieldFromYamlKey] public readonly Actor[] value = {};
public CargoInit() { } public CargoInit() { }
public CargoInit( Actor[] init ) { value = init; } public CargoInit(Actor[] init) { value = init; }
public Actor[] Value( World world ) { return value; } public Actor[] Value(World world) { return value; }
} }
} }