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

calculate exitLocation before FrameEndTask

Browse Source 
and add more null and dead checks to be safe
This commit is contained in:
Matthias Mailänder
2014-05-31 16:04:59 +02:00
parent c1f8a8e315
commit a900f24466
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenRA.Mods.RA/Production.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA
public Production(ProductionInfo info, Actor self) public Production(ProductionInfo info, Actor self)
{ {
Info = info; Info = info;
rp = Exts.Lazy(() => self.TraitOrDefault<RallyPoint>()); rp = Exts.Lazy(() => self.IsDead() ? null : self.TraitOrDefault<RallyPoint>());
} }
public void DoProduction(Actor self, ActorInfo producee, ExitInfo exitinfo) public void DoProduction(Actor self, ActorInfo producee, ExitInfo exitinfo)
@@ -60,6 +60,10 @@ namespace OpenRA.Mods.RA
var fi = producee.Traits.Get<IFacingInfo>(); var fi = producee.Traits.Get<IFacingInfo>();
var initialFacing = exitinfo.Facing < 0 ? Util.GetFacing(to - spawn, fi.GetInitialFacing()) : exitinfo.Facing; var initialFacing = exitinfo.Facing < 0 ? Util.GetFacing(to - spawn, fi.GetInitialFacing()) : exitinfo.Facing;
var exitLocation = rp.Value != null ? rp.Value.rallyPoint : exit;
var target = Target.FromCell(exitLocation);
var nearEnough = rp.Value != null ? WRange.FromCells(rp.Value.nearEnough) : WRange.Zero;
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
var newUnit = self.World.CreateActor(producee.Name, new TypeDictionary var newUnit = self.World.CreateActor(producee.Name, new TypeDictionary
@@ -70,31 +74,22 @@ namespace OpenRA.Mods.RA
new FacingInit(initialFacing) new FacingInit(initialFacing)
}); });
var move = newUnit.Trait<IMove>();
if (exitinfo.MoveIntoWorld)
newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit));
var target = MoveToRallyPoint(self, newUnit, exit);
newUnit.SetTargetLine(Target.FromCell(target), Color.Green, false);
foreach (var t in self.TraitsImplementing<INotifyProduction>())
t.UnitProduced(self, newUnit, exit);
});
}
CPos MoveToRallyPoint(Actor self, Actor newUnit, CPos exitLocation)
{
if (self.IsDead() || rp.Value == null)
return exitLocation;
var move = newUnit.TraitOrDefault<IMove>(); var move = newUnit.TraitOrDefault<IMove>();
if (move != null) if (move != null)
{ {
if (exitinfo.MoveIntoWorld)
newUnit.QueueActivity(move.MoveIntoWorld(newUnit, exit));
newUnit.QueueActivity(new AttackMove.AttackMoveActivity( newUnit.QueueActivity(new AttackMove.AttackMoveActivity(
newUnit, move.MoveTo(rp.Value.rallyPoint, rp.Value.nearEnough))); newUnit, move.MoveWithinRange(target, nearEnough)));
return rp.Value.rallyPoint;
} }
return exitLocation; newUnit.SetTargetLine(target, Color.Green, false);
if (!self.IsDead())
foreach (var t in self.TraitsImplementing<INotifyProduction>())
t.UnitProduced(self, newUnit, exit);
});
} }
public virtual bool Produce(Actor self, ActorInfo producee) public virtual bool Produce(Actor self, ActorInfo producee)