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

Fix WithCargo desync.

Browse Source
This commit is contained in:
Paul Chote
2015-08-17 19:40:44 +01:00
committed by Matthias Mailänder
parent eae41b1750
commit 8730a7f223
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Cnc/Traits/Render/WithCargo.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.Cnc.Traits
public object Create(ActorInitializer init) { return new WithCargo(init.Self, this); } public object Create(ActorInitializer init) { return new WithCargo(init.Self, this); }
} }
public class WithCargo : IRenderModifier public class WithCargo : IRenderModifier, ITick
{ {
readonly Cargo cargo; readonly Cargo cargo;
readonly IFacing facing; readonly IFacing facing;
@@ -45,6 +45,19 @@ namespace OpenRA.Mods.Cnc.Traits
body = self.Trait<IBodyOrientation>(); body = self.Trait<IBodyOrientation>();
} }
public void Tick(Actor self)
{
if (facing == null)
return;
foreach (var c in cargo.Passengers)
{
var cargoFacing = c.TraitOrDefault<IFacing>();
if (cargoFacing != null)
cargoFacing.Facing = facing.Facing;
}
}
public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r) public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
{ {
foreach (var rr in r) foreach (var rr in r)
@@ -55,10 +68,6 @@ namespace OpenRA.Mods.Cnc.Traits
var i = 0; var i = 0;
foreach (var c in cargo.Passengers) foreach (var c in cargo.Passengers)
{ {
var cargoFacing = c.TraitOrDefault<IFacing>();
if (facing != null && cargoFacing != null)
cargoFacing.Facing = facing.Facing;
var cargoPassenger = c.Trait<Passenger>(); var cargoPassenger = c.Trait<Passenger>();
if (cargoInfo.DisplayTypes.Contains(cargoPassenger.Info.CargoType)) if (cargoInfo.DisplayTypes.Contains(cargoPassenger.Info.CargoType))
{ {