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

Pushed down the MouseInput handling to the OrderGenerators and made a base class for handling the basic logic

Browse Source
This commit is contained in:
teinarss
2019-03-30 20:07:11 +01:00
committed by reaperrr
parent 9ec8d25dff
commit 1dd90a1d7b
13 changed files with 120 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Cnc/Traits/PortableChrono.cs
View File

@@ -180,7 +180,7 @@ namespace OpenRA.Mods.Cnc.Traits
}
}
class PortableChronoOrderGenerator : IOrderGenerator
class PortableChronoOrderGenerator : OrderGenerator
{
readonly Actor self;
readonly PortableChronoInfo info;
@@ -191,7 +191,7 @@ namespace OpenRA.Mods.Cnc.Traits
this.info = info;
}
public IEnumerable<Order> Order(World world, CPos cell, int2 worldPixel, MouseInput mi)
protected override IEnumerable<Order> OrderInner(World world, CPos cell, int2 worldPixel, MouseInput mi)
{
if (mi.Button == Game.Settings.Game.MouseButtonPreference.Cancel)
{
@@ -207,18 +207,18 @@ namespace OpenRA.Mods.Cnc.Traits
}
}
public void Tick(World world)
protected override void Tick(World world)
{
if (!self.IsInWorld || self.IsDead)
world.CancelInputMode();
}
public IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
protected override IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
{
yield break;
}
public IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
{
if (!self.IsInWorld || self.Owner != self.World.LocalPlayer)
yield break;
@@ -234,7 +234,7 @@ namespace OpenRA.Mods.Cnc.Traits
Color.FromArgb(96, Color.Black));
}
public string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
protected override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
{
if (self.IsInWorld && self.Location != cell
&& self.Trait<PortableChrono>().CanTeleport && self.Owner.Shroud.IsExplored(cell))