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

Remove InitialActivity

Browse Source
This commit is contained in:
reaperrr
2015-07-07 03:48:25 +02:00
parent 69c49c0139
commit 1baae6653c
11 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.D2k/Traits/Buildings/FreeActorWithDelivery.cs
View File

@@ -51,19 +51,16 @@ namespace OpenRA.Mods.D2k.Traits
self = init.Self;
Info = info;
DoDelivery(self.Location + info.DeliveryOffset, info.Actor, info.DeliveringActor, info.InitialActivity);
DoDelivery(self.Location + info.DeliveryOffset, info.Actor, info.DeliveringActor);
}
public void DoDelivery(CPos location, string actorName, string carrierActorName, string clientInitialActivity)
public void DoDelivery(CPos location, string actorName, string carrierActorName)
{
Actor cargo;
Actor carrier;
CreateActors(actorName, carrierActorName, out cargo, out carrier);
if (clientInitialActivity != null)
cargo.QueueActivity(Game.CreateObject<Activity>(clientInitialActivity));
var carryable = cargo.Trait<Carryable>();
carryable.Destination = location;
carryable.Reserve(carrier);

4
OpenRA.Mods.D2k/Traits/Buildings/ProductionFromMapEdge.cs
View File

@@ -68,10 +68,6 @@ namespace OpenRA.Mods.D2k.Traits
foreach (var notify in notifyOthers)
notify.Trait.UnitProducedByOther(notify.Actor, self, newUnit);
var bi = newUnit.Info.Traits.GetOrDefault<BuildableInfo>();
if (bi != null && bi.InitialActivity != null)
newUnit.QueueActivity(Game.CreateObject<Activity>(bi.InitialActivity));
foreach (var t in newUnit.TraitsImplementing<INotifyBuildComplete>())
t.BuildingComplete(newUnit);
});

2
OpenRA.Mods.D2k/Traits/Player/HarvesterInsurance.cs
View File

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.D2k.Traits
var refinery = refineries.First().Actor;
var delivery = refinery.Trait<FreeActorWithDelivery>();
delivery.DoDelivery(refinery.Location + delivery.Info.DeliveryOffset, delivery.Info.Actor,
delivery.Info.DeliveringActor, delivery.Info.InitialActivity);
delivery.Info.DeliveringActor);
}
}
}