Add key handling to order generators.

OpenRA · Jun 10, 2019 · 44e41cc · 44e41cc
1 parent 0eb5063
commit 44e41cc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/OpenRA.Game/Orders/IOrderGenerator.cs b/OpenRA.Game/Orders/IOrderGenerator.cs
@@ -22,5 +22,6 @@ public interface IOrderGenerator
 		IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world);
 		string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi);
 		void Deactivate();
+		bool HandleKeyPress(KeyInput e);
 	}
 }
diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
@@ -86,6 +86,8 @@ public virtual string GetCursor(World world, CPos cell, int2 worldPixel, MouseIn
 
 		public void Deactivate() { }
 
+		bool IOrderGenerator.HandleKeyPress(KeyInput e) { return false; }
+
 		// Used for classic mouse orders, determines whether or not action at xy is move or select
 		public virtual bool InputOverridesSelection(WorldRenderer wr, World world, int2 xy, MouseInput mi)
 		{

diff --git a/OpenRA.Mods.Common/Orders/OrderGenerator.cs b/OpenRA.Mods.Common/Orders/OrderGenerator.cs
@@ -30,6 +30,7 @@ public IEnumerable<Order> Order(World world, CPos cell, int2 worldPixel, MouseIn
 		IEnumerable<IRenderable> IOrderGenerator.RenderAboveShroud(WorldRenderer wr, World world) { return RenderAboveShroud(wr, world); }
 		string IOrderGenerator.GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi) { return GetCursor(world, cell, worldPixel, mi); }
 		void IOrderGenerator.Deactivate() { }
+		bool IOrderGenerator.HandleKeyPress(KeyInput e) { return false; }
 
 		protected abstract void Tick(World world);
 		protected abstract IEnumerable<IRenderable> Render(WorldRenderer wr, World world);

diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SelectDirectionalTarget.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SelectDirectionalTarget.cs
@@ -144,6 +144,8 @@ IEnumerable<IRenderable> IOrderGenerator.RenderAboveShroud(WorldRenderer wr, Wor
 
 		string IOrderGenerator.GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi) { return cursor; }
 
+		bool IOrderGenerator.HandleKeyPress(KeyInput e) { return false; }
+
 		void IOrderGenerator.Deactivate()
 		{
 			if (activated)

diff --git a/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs b/OpenRA.Mods.Common/Widgets/ViewportControllerWidget.cs
@@ -495,7 +495,7 @@ public override bool HandleKeyPress(KeyInput e)
 				}
 			}
 
-			return false;
+			return world.OrderGenerator.HandleKeyPress(e);
 		}
 
 		ScrollDirection CheckForDirections()