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

big cleanup of Controller mess

Browse Source
This commit is contained in:
Chris Forbes
2010-01-03 16:40:24 +13:00
parent 43498a123e
commit e742097046
9 changed files with 144 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRa.Game/Traits/ChronoshiftDeploy.cs
View File

@@ -18,21 +18,20 @@ namespace OpenRa.Game.Traits
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{
if (mi.Button == MouseButton.Left) return null;
if( mi.Button == MouseButton.Right && xy == self.Location && remainingChargeTime <= 0 )
{
if( mi.IsFake )
return new Order( "Deploy", self, null, int2.Zero, null );
else
Game.controller.orderGenerator = new TeleportOrderGenerator( self );
}
return new Order( "Deploy", self, null, int2.Zero, null );
return null;
}
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString == "Deploy")
{
Game.controller.orderGenerator = new TeleportOrderGenerator(self);
return;
}
var movement = self.traits.WithInterface<IMovement>().FirstOrDefault();
if (order.OrderString == "Chronoshift" && movement.CanEnterCell(order.TargetLocation))
{
@@ -46,6 +45,7 @@ namespace OpenRa.Game.Traits
public float GetSpeedModifier()
{
// ARGH! You must not do this, it will desync!
return (Game.controller.orderGenerator is TeleportOrderGenerator) ? 0f : 1f;
}