Hide cursor and render the placeholder directly

This commit is contained in:
teinarss
2019-04-14 20:23:09 +02:00
committed by reaperrr
parent 09f4b69aef
commit e801537d96
9 changed files with 33 additions and 13 deletions

View File

@@ -21,5 +21,6 @@ namespace OpenRA
IEnumerable<IRenderable> Render(WorldRenderer wr, World world);
IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world);
string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi);
void Deactivate();
}
}

View File

@@ -84,6 +84,8 @@ namespace OpenRA.Orders
return cursorOrder != null ? cursorOrder.Cursor : (useSelect ? "select" : "default");
}
public void Deactivate() { }
// 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)
{

View File

@@ -148,6 +148,9 @@ namespace OpenRA
set
{
Sync.AssertUnsynced("The current order generator may not be changed from synced code");
if (orderGenerator != null)
orderGenerator.Deactivate();
orderGenerator = value;
}
}
@@ -544,6 +547,9 @@ namespace OpenRA
{
Disposing = true;
if (OrderGenerator != null)
OrderGenerator.Deactivate();
frameEndActions.Clear();
Game.Sound.StopAudio();