tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Actions Rework" (#6888)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-25 18:55:18 +13:00
committed by GitHub
parent 5ac5dd6a64
commit 49ae383f06
135 changed files with 5165 additions and 3119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/DragDrop/DragDropSystem.cs
View File

@@ -204,7 +204,7 @@ namespace Content.Client.DragDrop
}
HighlightTargets();
_outline.SetEnabled(false);
_outline.Enabled = false;
// drag initiated
return true;
@@ -257,7 +257,7 @@ namespace Content.Client.DragDrop
EntityManager.DeleteEntity(_dragShadow);
}
_outline.SetEnabled(true);
_outline.Enabled = true;
_dragShadow = default;
_draggables.Clear();
_dragger = default;
@@ -353,7 +353,6 @@ namespace Content.Client.DragDrop
return false;
}
// TODO make this just use TargetOutlineSystem
private void HighlightTargets()
{
if (_dragDropHelper.Dragged == default || Deleted(_dragDropHelper.Dragged) ||
@@ -371,7 +370,7 @@ namespace Content.Client.DragDrop
RemoveHighlights();
// find possible targets on screen even if not reachable
// TODO: Duplicated in SpriteSystem and TargetOutlineSystem. Should probably be cached somewhere for a frame?
// TODO: Duplicated in SpriteSystem
var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition).Position;
var bounds = new Box2(mousePos - 1.5f, mousePos + 1.5f);
var pvsEntities = IoCManager.Resolve<IEntityLookup>().GetEntitiesIntersecting(_eyeManager.CurrentMap, bounds, LookupFlags.Approximate | LookupFlags.IncludeAnchored);