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

Merge pull request #13181 from pchote/repair-cursor-flash

Browse Source 
Fix repair cursor visual feedback target.
This commit is contained in:
atlimit8
2017-04-25 16:52:10 -05:00
committed by GitHub
parent 61a1cc18e1 d9800d4e2b
commit 2ae40e7eb4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Game/Network/Order.cs
View File

@@ -46,6 +46,7 @@ namespace OpenRA
public uint ExtraData; public uint ExtraData;
public bool IsImmediate; public bool IsImmediate;
public bool SuppressVisualFeedback; public bool SuppressVisualFeedback;
public Actor VisualFeedbackTarget;
public Player Player { get { return Subject != null ? Subject.Owner : null; } } public Player Player { get { return Subject != null ? Subject.Owner : null; } }

2
OpenRA.Mods.Common/Orders/RepairOrderGenerator.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Orders
if (repairBuilding == null) if (repairBuilding == null)
yield break; yield break;
yield return new Order(orderId, underCursor, false) { TargetActor = repairBuilding }; yield return new Order(orderId, underCursor, false) { TargetActor = repairBuilding, VisualFeedbackTarget = underCursor };
} }
public void Tick(World world) public void Tick(World world)

5
OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -194,9 +194,10 @@ namespace OpenRA.Mods.Common.Widgets
if (!flashed && !o.SuppressVisualFeedback) if (!flashed && !o.SuppressVisualFeedback)
{ {
if (o.TargetActor != null) var visualTargetActor = o.VisualFeedbackTarget ?? o.TargetActor;
if (visualTargetActor != null)
{ {
world.AddFrameEndTask(w => w.Add(new FlashTarget(o.TargetActor))); world.AddFrameEndTask(w => w.Add(new FlashTarget(visualTargetActor)));
flashed = true; flashed = true;
} }
else if (o.TargetLocation != CPos.Zero) else if (o.TargetLocation != CPos.Zero)