(064609500) Fixed nearby items being selected when dragging/selecting/modifying wires in the sub editor.
This commit is contained in:
@@ -60,11 +60,6 @@ namespace Barotrauma
|
|||||||
|
|
||||||
public CrewManager(XElement element, bool isSinglePlayer)
|
public CrewManager(XElement element, bool isSinglePlayer)
|
||||||
: this(isSinglePlayer)
|
: this(isSinglePlayer)
|
||||||
{
|
|
||||||
return characterListBox.Rect;
|
|
||||||
}
|
|
||||||
|
|
||||||
partial void InitProjectSpecific()
|
|
||||||
{
|
{
|
||||||
guiFrame = new GUIFrame(new RectTransform(Vector2.One, GUICanvas.Instance), null, Color.Transparent)
|
guiFrame = new GUIFrame(new RectTransform(Vector2.One, GUICanvas.Instance), null, Color.Transparent)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -131,6 +131,12 @@ namespace Barotrauma.Items.Components
|
|||||||
//dragging a node of some wire
|
//dragging a node of some wire
|
||||||
if (draggingWire != null)
|
if (draggingWire != null)
|
||||||
{
|
{
|
||||||
|
if (Character.Controlled != null)
|
||||||
|
{
|
||||||
|
Character.Controlled.FocusedItem = null;
|
||||||
|
Character.Controlled.ResetInteract = true;
|
||||||
|
Character.Controlled.ClearInputs();
|
||||||
|
}
|
||||||
//cancel dragging
|
//cancel dragging
|
||||||
if (!PlayerInput.LeftButtonHeld())
|
if (!PlayerInput.LeftButtonHeld())
|
||||||
{
|
{
|
||||||
@@ -178,6 +184,11 @@ namespace Barotrauma.Items.Components
|
|||||||
{
|
{
|
||||||
if (PlayerInput.LeftButtonClicked())
|
if (PlayerInput.LeftButtonClicked())
|
||||||
{
|
{
|
||||||
|
if (Character.Controlled != null)
|
||||||
|
{
|
||||||
|
Character.Controlled.ResetInteract = true;
|
||||||
|
Character.Controlled.ClearInputs();
|
||||||
|
}
|
||||||
int closestSectionIndex = selectedWire.GetClosestSectionIndex(mousePos, sectionSelectDist, out _);
|
int closestSectionIndex = selectedWire.GetClosestSectionIndex(mousePos, sectionSelectDist, out _);
|
||||||
if (closestSectionIndex > -1)
|
if (closestSectionIndex > -1)
|
||||||
{
|
{
|
||||||
@@ -196,6 +207,11 @@ namespace Barotrauma.Items.Components
|
|||||||
//start dragging the node
|
//start dragging the node
|
||||||
if (PlayerInput.LeftButtonHeld())
|
if (PlayerInput.LeftButtonHeld())
|
||||||
{
|
{
|
||||||
|
if (Character.Controlled != null)
|
||||||
|
{
|
||||||
|
Character.Controlled.ResetInteract = true;
|
||||||
|
Character.Controlled.ClearInputs();
|
||||||
|
}
|
||||||
draggingWire = selectedWire;
|
draggingWire = selectedWire;
|
||||||
selectedNodeIndex = closestIndex;
|
selectedNodeIndex = closestIndex;
|
||||||
}
|
}
|
||||||
@@ -249,6 +265,13 @@ namespace Barotrauma.Items.Components
|
|||||||
{
|
{
|
||||||
highlighted.item.IsHighlighted = true;
|
highlighted.item.IsHighlighted = true;
|
||||||
|
|
||||||
|
if (Character.Controlled != null)
|
||||||
|
{
|
||||||
|
Character.Controlled.FocusedItem = null;
|
||||||
|
Character.Controlled.ResetInteract = true;
|
||||||
|
Character.Controlled.ClearInputs();
|
||||||
|
}
|
||||||
|
|
||||||
if (PlayerInput.LeftButtonClicked())
|
if (PlayerInput.LeftButtonClicked())
|
||||||
{
|
{
|
||||||
MapEntity.DisableSelect = true;
|
MapEntity.DisableSelect = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user