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

remove some dumb state-tracking from OreRefinery

Browse Source
This commit is contained in:
Chris Forbes
2010-12-27 20:03:19 +13:00
parent d8eaa7c841
commit e127095437
3 changed files with 14 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.RA/Harvester.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA
public object Create(ActorInitializer init) { return new Harvester(init.self, this); }
}
public class Harvester : IIssueOrder, IResolveOrder, INotifyDamage, IPips,
public class Harvester : IIssueOrder, IResolveOrder, IPips,
IRenderModifier, IExplodeModifier, IOrderVoice,
ISpeedModifier
{
@@ -53,8 +53,6 @@ namespace OpenRA.Mods.RA
public void ChooseNewProc(Actor self, Actor ignore)
{
LinkedProc = ClosestProc(self, ignore);
if (LinkedProc != null)
LinkedProc.TraitsImplementing<IAcceptOre>().FirstOrDefault().LinkHarvester(LinkedProc,self);
}
Actor ClosestProc(Actor self, Actor ignore)
@@ -131,12 +129,7 @@ namespace OpenRA.Mods.RA
else if (order.OrderString == "Deliver")
{
if (order.TargetActor != LinkedProc)
{
if (LinkedProc != null && LinkedProc.IsInWorld)
LinkedProc.TraitsImplementing<IAcceptOre>().FirstOrDefault().UnlinkHarvester(LinkedProc,self);
LinkedProc = order.TargetActor;
LinkedProc.TraitsImplementing<IAcceptOre>().FirstOrDefault().LinkHarvester(LinkedProc,self);
}
if (IsEmpty)
return;
@@ -147,13 +140,6 @@ namespace OpenRA.Mods.RA
self.QueueActivity(new DeliverResources());
}
}
public void Damaged(Actor self, AttackInfo e)
{
if (e.DamageState == DamageState.Dead)
if (LinkedProc != null && !LinkedProc.Destroyed)
LinkedProc.TraitsImplementing<IAcceptOre>().FirstOrDefault().UnlinkHarvester(LinkedProc,self);
}
public void LinkProc(Actor self, Actor proc)
{