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

Merge pull request #8674 from reaperrr/rem-initact

Browse Source 
Removed InitialActivity from FreeActor and Buildable
This commit is contained in:
Oliver Brakmann
2015-07-09 18:47:13 +02:00
parent 0835504c53 a29516656f
commit 4792ff336b
12 changed files with 29 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);