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

Merge branch 'master' of git://github.com/chrisforbes/OpenRA into cpu-independent

Browse Source
This commit is contained in:
Matthew Bowra-Dean
2010-01-20 18:47:00 +13:00
parent a9f2e344cf 6dc3958347
commit 3842addff4
11 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Traits/Activities/Rearm.cs
View File

@@ -2,7 +2,7 @@
namespace OpenRa.Traits.Activities
{
class Rearm : IActivity
public class Rearm : IActivity
{
public IActivity NextActivity { get; set; }
bool isCanceled;

5
OpenRa.Game/Traits/Activities/Repair.cs
View File

@@ -5,12 +5,15 @@ using System.Text;
namespace OpenRa.Traits.Activities
{
class Repair : IActivity
public class Repair : IActivity
{
public IActivity NextActivity { get; set; }
bool isCanceled;
bool playHostAnim;
int remainingTicks;
public Repair(bool playHostAnim) { this.playHostAnim = playHostAnim; }
public IActivity Tick(Actor self)
{
if (isCanceled) return NextActivity;

8
OpenRa.Game/Traits/Helicopter.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRa.Traits
return null;
}
public void ResolveOrder( Actor self, Order order )
public void ResolveOrder(Actor self, Order order)
{
if (reservation != null)
{
@@ -49,7 +49,7 @@ namespace OpenRa.Traits
{
self.CancelActivity();
self.QueueActivity(new HeliFly(Util.CenterOfCell(order.TargetLocation)));
self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing ) );
self.QueueActivity(new Turn(self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing));
self.QueueActivity(new HeliLand(true));
}
@@ -66,10 +66,10 @@ namespace OpenRa.Traits
self.CancelActivity();
self.QueueActivity(new HeliFly(order.TargetActor.CenterLocation + offsetVec));
self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing ) );
self.QueueActivity(new Turn(self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing));
self.QueueActivity(new HeliLand(false));
self.QueueActivity(order.TargetActor.Info.Name == "hpad"
? (IActivity)new Rearm() : new Repair());
? (IActivity)new Rearm() : new Repair(true));
}
}

2
OpenRa.Game/Traits/Plane.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRa.Traits
self.CancelActivity();
self.QueueActivity(new ReturnToBase(self, order.TargetActor));
self.QueueActivity(order.TargetActor.Info.Name == "afld"
? (IActivity)new Rearm() : new Repair());
? (IActivity)new Rearm() : new Repair(true));
}
}

2
OpenRa.Game/Traits/Repairable.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRa.Traits
self.CancelActivity();
self.QueueActivity(new Move(((1 / 24f) * order.TargetActor.CenterLocation).ToInt2(), order.TargetActor));
self.QueueActivity(new Rearm());
self.QueueActivity(new Repair());
self.QueueActivity(new Repair(true));
}
}
}