vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(064609500) Fixed nearby items being selected when dragging/selecting/modifying wires in the sub editor.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-05 16:15:12 +03:00
parent 6c2c522f30
commit 94fe1ba331
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
View File

@@ -60,11 +60,6 @@ namespace Barotrauma
public CrewManager(XElement element, bool isSinglePlayer)
: this(isSinglePlayer)
{
return characterListBox.Rect;
}
partial void InitProjectSpecific()
{
guiFrame = new GUIFrame(new RectTransform(Vector2.One, GUICanvas.Instance), null, Color.Transparent)
{

23
Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs
View File

@@ -131,6 +131,12 @@ namespace Barotrauma.Items.Components
//dragging a node of some wire
if (draggingWire != null)
{
if (Character.Controlled != null)
{
Character.Controlled.FocusedItem = null;
Character.Controlled.ResetInteract = true;
Character.Controlled.ClearInputs();
}
//cancel dragging
if (!PlayerInput.LeftButtonHeld())
{
@@ -178,6 +184,11 @@ namespace Barotrauma.Items.Components
{
if (PlayerInput.LeftButtonClicked())
{
if (Character.Controlled != null)
{
Character.Controlled.ResetInteract = true;
Character.Controlled.ClearInputs();
}
int closestSectionIndex = selectedWire.GetClosestSectionIndex(mousePos, sectionSelectDist, out _);
if (closestSectionIndex > -1)
{
@@ -196,6 +207,11 @@ namespace Barotrauma.Items.Components
//start dragging the node
if (PlayerInput.LeftButtonHeld())
{
if (Character.Controlled != null)
{
Character.Controlled.ResetInteract = true;
Character.Controlled.ClearInputs();
}
draggingWire = selectedWire;
selectedNodeIndex = closestIndex;
}
@@ -249,6 +265,13 @@ namespace Barotrauma.Items.Components
{
highlighted.item.IsHighlighted = true;
if (Character.Controlled != null)
{
Character.Controlled.FocusedItem = null;
Character.Controlled.ResetInteract = true;
Character.Controlled.ClearInputs();
}
if (PlayerInput.LeftButtonClicked())
{
MapEntity.DisableSelect = true;